Removed AND key from the filter method on BaseModule class