Search refactor
Fix broken search button