Added expand/shrink query with highlighting feature to easy determine the query