Added three missing filters, renamed one
Changed code to use custom managers