Fixes to search layout