Added filter configuration option - needs to check type before filtering