fixed query param extraction