fixes to search and header