diff --git a/apps/src/templates/SchoolAutocompleteDropdown.jsx b/apps/src/templates/SchoolAutocompleteDropdown.jsx
index 919e90aabf4d9..25f70569d2877 100644
--- a/apps/src/templates/SchoolAutocompleteDropdown.jsx
+++ b/apps/src/templates/SchoolAutocompleteDropdown.jsx
@@ -11,16 +11,21 @@ export default class SchoolAutocompleteDropdown extends Component {
     onChange: PropTypes.func.isRequired,
     // Value is the NCES id of the school
     value: PropTypes.string,
-    fieldName: PropTypes.string
+    fieldName: PropTypes.string,
+    schoolDropdownOption: PropTypes.object,
+    schoolFilter: PropTypes.func,
   };
 
   static defaultProps = {
-    fieldName: "nces_school_s"
+    fieldName: "nces_school_s",
+    schoolFilter: () => true,
   };
 
+
   constructSchoolOption = school => ({
     value: school.nces_id.toString(),
-    label: `${school.name} - ${school.city}, ${school.state} ${school.zip}`
+    label: `${school.name} - ${school.city}, ${school.state} ${school.zip}`,
+    school: school,
   });
 
   constructSchoolNotFoundOption = () => ({
@@ -45,7 +50,7 @@ export default class SchoolAutocompleteDropdown extends Component {
     fetch(searchUrl)
       .then(response => response.ok ? response.json() : [])
       .then(json => {
-        const schools = json.map(school => this.constructSchoolOption(school));
+        const schools = json.filter(this.props.schoolFilter).map(school => this.constructSchoolOption(school));
         schools.unshift(this.constructSchoolNotFoundOption());
         return { options: schools };
       })
@@ -93,7 +98,7 @@ export default class SchoolAutocompleteDropdown extends Component {
         loadOptions={this.getOptions}
         cache={false}
         filterOption={() => true}
-        value={this.props.value}
+        value={this.props.schoolDropdownOption ? this.props.schoolDropdownOption : this.props.value}
         onChange={this.props.onChange}
         placeholder={i18n.searchForSchool()}
       />
diff --git a/apps/src/templates/census2017/SchoolAutocompleteDropdownWithLabel.jsx b/apps/src/templates/census2017/SchoolAutocompleteDropdownWithLabel.jsx
index 0c09a444ef709..ee5c639c722bb 100644
--- a/apps/src/templates/census2017/SchoolAutocompleteDropdownWithLabel.jsx
+++ b/apps/src/templates/census2017/SchoolAutocompleteDropdownWithLabel.jsx
@@ -30,8 +30,12 @@ export default class SchoolAutocompleteDropdownWithLabel extends Component {
     fieldName: PropTypes.string,
     singleLineLayout: PropTypes.bool,
     showRequiredIndicator: PropTypes.bool,
+    schoolDropdownOption: PropTypes.object,
+    schoolFilter: PropTypes.func,
   };
 
+  schoolDropdown = undefined;
+
   static defaultProps = {
     showRequiredIndicator: true,
   };
@@ -43,12 +47,16 @@ export default class SchoolAutocompleteDropdownWithLabel extends Component {
   handleSchoolNotFoundCheckbox(event) {
     var checkbox = event.target;
     if (checkbox.checked) {
-      this.props.setField("nces", {value: "-1"});
+      this.props.setField("nces", this.schoolDropdown.constructSchoolNotFoundOption());
     } else {
-      this.props.setField("nces", {value: ""});
+      this.props.setField("nces", this.props.schoolDropdownOption);
     }
   }
 
+  bindDropdown = (dropdown) => {
+    this.schoolDropdown=dropdown;
+  };
+
   render() {
     const {showRequiredIndicator, singleLineLayout} = this.props;
     const questionStyle = {...styles.question, ...(singleLineLayout && singleLineLayoutStyles)};
@@ -71,9 +79,12 @@ export default class SchoolAutocompleteDropdownWithLabel extends Component {
             {!singleLineLayout && showError && errorDiv}
           </div>
           <SchoolAutocompleteDropdown
+            ref={this.bindDropdown}
             value={this.props.value}
             fieldName={this.props.fieldName}
             onChange={this.sendToParent}
+            schoolDropdownOption={this.props.schoolDropdownOption}
+            schoolFilter={this.props.schoolFilter}
           />
           <label>
             <input id="schoolNotFoundCheckbox" type="checkbox" onChange={this.handleSchoolNotFoundCheckbox.bind(this)} checked={this.props.value === "-1"}/>
diff --git a/apps/test/unit/templates/SchoolAutocompleteDropdownTest.js b/apps/test/unit/templates/SchoolAutocompleteDropdownTest.js
index 3c7d6f5cd557d..2ec8b6f925d8e 100644
--- a/apps/test/unit/templates/SchoolAutocompleteDropdownTest.js
+++ b/apps/test/unit/templates/SchoolAutocompleteDropdownTest.js
@@ -101,8 +101,8 @@ describe('SchoolAutocompleteDropdown', () => {
         return expect(promise).to.eventually.deep.equal({
           options: [
             {value: '-1', label: 'Other school not listed below (click here to provide details)'},
-            {value: '10', label: 'Abcd School 1 - Seattle, WA 98101'},
-            {value: '11', label: 'Abcd School 2 - Redmond, WA 98073'}
+            {value: '10', label: 'Abcd School 1 - Seattle, WA 98101', school: {nces_id: 10, name: 'Abcd School 1', city: 'Seattle', state: 'WA', zip: '98101'}},
+            {value: '11', label: 'Abcd School 2 - Redmond, WA 98073', school: {nces_id: 11, name: 'Abcd School 2', city: 'Redmond', state: 'WA', zip: '98073'}}
           ]
         });
       });
@@ -149,7 +149,7 @@ describe('SchoolAutocompleteDropdown', () => {
 
         return expect(promise).to.eventually.deep.equal({
           options: [
-            {value: '9999', label: 'Abcd School 1 - Seattle, WA 98101'}
+            {value: '9999', label: 'Abcd School 1 - Seattle, WA 98101', school: {nces_id: 9999, name: 'Abcd School 1', city: 'Seattle', state: 'WA', zip: '98101'}}
           ]
         });
       });
diff --git a/dashboard/lib/api/v1/school_autocomplete.rb b/dashboard/lib/api/v1/school_autocomplete.rb
index 7cf27658132cd..bd0ff9f264ac4 100644
--- a/dashboard/lib/api/v1/school_autocomplete.rb
+++ b/dashboard/lib/api/v1/school_autocomplete.rb
@@ -34,7 +34,7 @@ def self.search_by_zip?(query)
 
   # JSON serializer used by get_matches.
   class Serializer < ActiveModel::Serializer
-    attributes :nces_id, :name, :city, :state, :zip, :school_type
+    attributes :nces_id, :name, :city, :state, :zip, :school_type, :latitude, :longitude
 
     def nces_id
       object.id.to_s
diff --git a/dashboard/test/controllers/api/v1/schools_controller_test.rb b/dashboard/test/controllers/api/v1/schools_controller_test.rb
index 65c9e11792ca4..c2b793ad20d20 100644
--- a/dashboard/test/controllers/api/v1/schools_controller_test.rb
+++ b/dashboard/test/controllers/api/v1/schools_controller_test.rb
@@ -7,7 +7,9 @@ class Api::V1::SchoolsControllerTest < ActionController::TestCase
     name: 'Albert Einstein Academy Elementary',
     city: 'Santa Clarita',
     state: 'CA',
-    zip: '91355'
+    zip: '91355',
+    latitude: "34.4375",
+    longitude: "-118.576861"
   }.deep_stringify_keys.freeze
 
   GLADYS_JUNG_ELEMENTARY = {
@@ -16,7 +18,9 @@ class Api::V1::SchoolsControllerTest < ActionController::TestCase
     name: 'Gladys Jung Elementary',
     city: 'Bethel',
     state: 'AK',
-    zip: '99559'
+    zip: '99559',
+    latitude: "60.80254",
+    longitude: "-161.77072"
   }.deep_stringify_keys.freeze
 
   JOANN_A_ALEXIE_MEMORIAL_SCHOOL = {
@@ -25,7 +29,9 @@ class Api::V1::SchoolsControllerTest < ActionController::TestCase
     name: 'Joann A. Alexie Memorial School',
     city: 'Atmautluak',
     state: 'AK',
-    zip: '99559'
+    zip: '99559',
+    latitude: "60.866944",
+    longitude: "-162.273056"
   }.deep_stringify_keys.freeze
 
   test 'search by school name prefix' do