Fix location filtering