Filtering working, now I need to fix the recreation of the markers...