Issue #8345 by cableman: Update search to use one index pr. site