General clean up of filter views