Fixed some bugs with filters