Added return string for Survey object
Added proper grid handling