Fix active link color
Fix the query grouping