diff --git a/src/components/Questionnaire/BuildingUnitDropdown.js b/src/components/Questionnaire/BuildingUnitDropdown.js
index e40951ecd2a1f9712fbcb88c0e5eec8e0d67e14a..c1f87bed38694d86a6250f2dbbf09d6ba3c9dfcd 100644
--- a/src/components/Questionnaire/BuildingUnitDropdown.js
+++ b/src/components/Questionnaire/BuildingUnitDropdown.js
@@ -35,7 +35,7 @@ class BuildingUnitDropdown extends Component {
           <Input
             type="number"
             name={this.props.inputName}
-            placeholder="0"
+            placeholder="Please fill"
             value={this.state.numOfUnit}
             onChange={e => this.handleInputChange(e)}
           />
diff --git a/src/containers/Questionnaire/index.js b/src/containers/Questionnaire/index.js
index b7a08801a5cbae17adabd492a3f8e45f89e8055b..ea65ea369e3ab51565fd6badf32beace7948a873 100644
--- a/src/containers/Questionnaire/index.js
+++ b/src/containers/Questionnaire/index.js
@@ -52,6 +52,12 @@ class Questionnaire extends Component {
       legalOwnership: 'Legal ownership',
       numberOfHeatingViolations: 'Number of heating violations',
       numberOfDobViolations: 'Number of DOB violations',
+      studio: 'Number of studio units',
+      oneBedroom: 'Number of one bedroom units',
+      twoBedroom: 'Number of two bedroom units',
+      threeBedroom: 'Number of three bedroom units',
+      fourBedroom: 'Number of four bedroom units',
+      numOfOther: 'Number of other units',
     };
     this.state = {
       buildingInfo: {},
@@ -141,6 +147,13 @@ class Questionnaire extends Component {
           if (fieldData[0] === 'email' && !(validEmail.test(fieldData[1]))) {
             invalidFields.push(this.nameMapping[fieldData[0]]);
           }
+          if (fieldData[0] === 'unitInfo') {
+            Object.entries(fieldData[1]).forEach(unitData => {
+              if (unitData[0] !== 'other' && isNaN(unitData[1]) === true) {
+                emptyFields.push(this.nameMapping[unitData[0]]);
+              }
+            });
+          }
           if (typeof fieldData[1] === 'object' &&
             fieldData[1].answer_id !== undefined &&
             parseInt(fieldData[1].answer_id, 10) === -1 &&