updated to have content-type and accessibility data be seperate from generic filters