search bugs fixed