another attempt to fix query params