Fix enable/disable capability handlers (broken after drill down changes)