Fixed field names returned when using wildcard expression to specify fields to highlight

Closes #5221