Search bugs fixed