Merge branch 'area-search-fixes'

* area-search-fixes:
  area search fixes: revert old cruft
area search fixes: fix up tests
Merge branch 'master' into beta