fixed query and highlighting problems.