Fix some issues with search