some changes in location-filter predicate