Add option for both parcels and points in a survey

We should find a nicer way to do this in the future (eg make it easy to ask different questions for point and parcel?)