Updated feature for better views and primary contact field