Fix search and hover behavior