Fix filtering to use AND instead of OR
Sort neighborhoods/locations list
Merge pull request #258 from bhuber/topic/fix-nb-sort

Topic/fix nb sort