edit entity contacts improve