Fixed: Map not filtered