More tweaks for registration/competitor data