area search fixes: revert old cruft
Merge branch 'area-search-fixes' into beta

* area-search-fixes:
  area search fixes: revert old cruft