Reverted wrong fix for #SCL-6169 Comment
Added right fix to filter out values in case of generic call.