INFUND-6570 more parameterising
INFUND-6570 more parameterising


Former-commit-id: e5a3ad30a77bb2f358ba635b804a79241ba943bc
InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service