EMPIREDB-310
Overcome ParamterMap limitations (see Jira)
5 files changed