EHO-306 Added filter mapping parameter to prevent the IllegalStateException