Correct "Where" field and add contact lists