updated set_channels with a better logic
small update to display part of entitlement assignation function