Issue/335 edit adoption fields