use core capabilities instead of custom
make capability filterable