Brackets and quotes search bugs fixed