--HR-223 Tweak for 'is_primary' field