Add highlighting capability to queries