       district_id = @field('district_id').val()
       country_id  = @field('country_id').val()
       school_id   = @field('school_id')
-      if country_id 
+      if @international() && country_id
         url = "#{API_V1.SCHOOLS}?country_id=#{country_id}"
-      else if district_id
+      else if district_id && district_id != ''
         url = "#{API_V1.SCHOOLS}?district_id=#{district_id}"
-      else 
+      else
         return
 
       school_id.getSelectOptions url, (data) ->

          @showInternational()
          @showSchoolPicker()


    showInternational: ->
      $('.intl-only').removeClass 'hidden'

        district_id.addClass 'hidden'
        state.addClass 'hidden'

        if !@international()
          @hideInternational()
          state.getSelectOptions API_V1.STATES + "?country=#{country_id.val()}", (data) ->
            data.unshift undefined # we need an empty option for placeholder
