Fix filtering to use AND instead of OR
Sort neighborhoods/locations list