Corrected get_or_create query to be less strict.  Notably don’t freak out of the old owning key has been removed.