cleaning up how to return highlighted and normal search query