SSP-1609 - fixed bug for additional criteria