Query Recommendation - minor fixes