Further minor improvements to using IS_IN_SET to force a checkbox to be ticked