Close #167

Fixes Search for both admin and site