Rework how location relationship is saved. Fixed Animal location validation.