#189 moved filter from modules