fix cross-profile edit issues