Find Contact & Add Contact now have 'Select State' boxes, fixes #6651