fix query params!!!!