Update xref counter logic to allow 'multi-select' on add for faster role expansion