[FEATURE] Cleanup buildQueryParameters hook