Properly support highlight query

Change-Id: Ia58dfd61ffe4aeb29c5e034e6a3729c09a169e85