Fixed new Survey model logic