TW-33790 Reduced number of requests for parameters