Search is now working really well