location_helpers require apps, re-working filtering JS
Merge branch 'lextech' into scottmsims

* lextech:
  location_helpers require apps, re-working filtering JS