Possible fix for the use of type filter in security (MID-1873)