fix query params bugs