diff --git a/src/main_window.cpp b/src/main_window.cpp
index 72b3c50..59d6853 100644
--- a/src/main_window.cpp
+++ b/src/main_window.cpp
@@ -28,10 +28,9 @@ const char *menuNames[] = {"All Filters", "All Filters Sorted", "Blend", "Distor
 
 
 void generate_map() {
+    ac::fill_filter_map();
     for(int i = 0; i < ac::draw_max; ++i )
         filter_map[ac::draw_strings[i]] = FilterValue(0, i, -1);
-    
-    
     int index = 0;
     while(filter_names[index] != 0) {
         std::string filter_n = "AF_";
@@ -44,7 +43,6 @@ void generate_map() {
         std::string name = "plugin " + plugins.plugin_list[j]->name();
         filter_map[name] = FilterValue(2, j, -1);
     }
-    
 }
 
 void custom_filter(cv::Mat &) {
diff --git a/src/playback_thread.cpp b/src/playback_thread.cpp
index bb10e5c..b5aa96e 100644
--- a/src/playback_thread.cpp
+++ b/src/playback_thread.cpp
@@ -191,7 +191,8 @@ void Playback::drawEffects(cv::Mat &frame) {
 void Playback::drawFilter(cv::Mat &frame, FilterValue &f) {
     if(f.index == 0) {
         ac::setSubFilter(f.subfilter);
-        ac::draw_func[f.filter](frame);
+        //ac::draw_func[f.filter](frame);
+        ac::CallFilter(f.filter, frame);
         ac::setSubFilter(-1);
     } else if(current_filter.index == 1) {
         current_filterx = f.filter;