Criteria et modifyContact done (but not working because of phoneNumbers)

Other small improvements.