Issue 2382 sitesearch improvements