Replaced the Maps to be actually in sync with filter