Fix search
Fix tests