Fixed highlight on query
Merge branch 'feature/highlight-on-query' into develop