Renamed filters to be less generic and updated docs