phone number detection improved, 'city' field is escaped