Abstracted visibility filter
Added category listing