Search bug fixes