MDL-63913 core_message: fix to ensure favourites is exclusive