Fixes for the search head