Fixes #80, Better highlighting for query results