Card #92 - fix for persisting contact points (uses entitymanager.find)