FIX: Better check for undefined filter class
Working on new maintenance release