Make new sighting form work with new data model