Fixed issue with mapping table uniqueness of both the rider and affinity group together.