Category filtering added.