location filter fix etc