Fix map filtering