Better performance on contact edit