Fix to accept empty arrays on Highlight queries

Here is a fix for #2974 specific case.