Add query filter on enabled