Fix compatibility when using INTERMediator.additionalCondition or INTERMediator.additionalSortKey