Contact fixes for filtering and editing