NXP-13176: Extract request parameter and align query request generation