fixing issue with duplicate query params and duplicate results