diff --git a/arches/app/models/entity.py b/arches/app/models/entity.py
index 3c64743306..a984a01d7e 100644
--- a/arches/app/models/entity.py
+++ b/arches/app/models/entity.py
@@ -30,7 +30,6 @@
 from django.db import connection
 from django.db import transaction
 from django.core.files.uploadedfile import InMemoryUploadedFile, TemporaryUploadedFile
-from django.core.files import File
 from arches.app.models.concept import Concept
 from arches.app.utils.betterJSONSerializer import JSONSerializer, JSONDeserializer
 from django.core.exceptions import ObjectDoesNotExist
@@ -243,7 +242,6 @@ def _save(self):
                     self.value = themodelinstance.geturl()
                     self.label = themodelinstance.getname()
 
-
         for child_entity in self.child_entities:
             child = child_entity._save()
             rule = archesmodels.Rules.objects.get(entitytypedomain = entity.entitytypeid, entitytyperange = child.entitytypeid, propertyid = child_entity.property)
diff --git a/arches/install/requirements.txt b/arches/install/requirements.txt
index c570e3cbaa..21a92c81bc 100644
--- a/arches/install/requirements.txt
+++ b/arches/install/requirements.txt
@@ -26,6 +26,14 @@ urllib3>=1.23
 validators==0.10.3
 wsgiref==0.1.2
 xlrd==0.9.0
+<<<<<<< HEAD
+Pillow==2.4.0
+rdflib
+unicodecsv
+pyyaml
+pyshp>=2.0.1
+=======
+>>>>>>> 7ab0cdfb9690a3e7e86b746f179aaed825c10ea7
 
 # Leave the following line commented so that pip install will ignore this
 # The installer uses the following line to download the proper version of ES
diff --git a/eamena/eamena/source_data/business_data/resource_export_mappings.json b/eamena/eamena/source_data/business_data/resource_export_mappings.json
index 61973d633d..76195b1e9a 100755
--- a/eamena/eamena/source_data/business_data/resource_export_mappings.json
+++ b/eamena/eamena/source_data/business_data/resource_export_mappings.json
@@ -650,32 +650,32 @@
             {"field_name": "Geom_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
             {"field_name": "Loc_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
             {"field_name": "Topography","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Period","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Per_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Form","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Form_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Arrangement","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Feature_No","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Feat_Shape","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Interpretation","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Inter_Cert","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Inter_No","source": "field_map", "data_type":"str", "data_length":"128"},
+            {"field_name": "Period","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Per_Cert","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Form","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Form_Cert","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Arrangement","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Feature_No","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Feat_Shape","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Interpretation","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Inter_Cert","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Inter_No","source": "field_map", "data_type":"str", "data_length":"255"},
             {"field_name": "Condition","source": "field_map", "data_type":"str", "data_length":"128"},
             {"field_name": "Dist_Extent","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Dist_Type","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Dist_Cause","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistCauseCert","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistDateBefore","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistDateOn","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistDateFrom","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistDateTo","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistEffect","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "DistEffCert","source": "field_map", "data_type":"str", "data_length":"128"},
+            {"field_name": "Dist_Type","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "Dist_Cause","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistCauseCert","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistDateBefore","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistDateOn","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistDateFrom","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistDateTo","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistEffect","source": "field_map", "data_type":"str", "data_length":"255"},
+            {"field_name": "DistEffCert","source": "field_map", "data_type":"str", "data_length":"255"},
             {"field_name": "ThreatType","source": "field_map", "data_type":"str", "data_length":"128"},
             {"field_name": "ThreatCause","source": "field_map", "data_type":"str", "data_length":"128"},
             {"field_name": "ThrCauseCert","source": "field_map", "data_type":"str", "data_length":"128"},
             {"field_name": "Desc_Type","source": "field_map", "data_type":"str", "data_length":"128"},
-            {"field_name": "Description","source": "field_map", "data_type":"str", "data_length":"128"},
+            {"field_name": "Description","source": "field_map", "data_type":"str", "data_length":"255"},
             {"field_name": "Assessor","source": "field_map", "data_type":"str", "data_length":"128"}
         ],
         "RESOURCE_TYPES": {
diff --git a/eamena/eamena/templates/search.htm b/eamena/eamena/templates/search.htm
index 613d6a5d2f..ae02174d17 100755
--- a/eamena/eamena/templates/search.htm
+++ b/eamena/eamena/templates/search.htm
@@ -117,7 +117,7 @@
                         <li><a href="javascript:void(0);" id="view-saved-searches">{% trans "View Popular Searches" %}</a></li>
                         <li class="divider"></li>
                         {% if 'edit' in user.user_groups %}
-                        <li><a class="dataexport" id="shp" href="" target="_blank">{% trans "Export results to .SHP" %}</a></li>
+                        <li><a class="dataexport" id="shp" href="" target="_blank" onclick="return confirm('Warning: Shapefile export will truncate attributes to 250 characters')">{% trans "Export results to .SHP" %}</a></li>
                         <li><a class="dataexport" id="csv" href="" target="_blank">{% trans "Export results to .CSV" %} </a></li>
                         <li><a class="dataexport" id="kml" href="" target="_blank">{% trans "Export results to .KML" %} </a></li>
                         <li><a class="dataexport" id="json" href="" target="_blank">{% trans "Export results to .JSON" %} </a></li>
diff --git a/saved-searches.htm b/saved-searches.htm
new file mode 100644
index 0000000000..fbc7ae588a
--- /dev/null
+++ b/saved-searches.htm
@@ -0,0 +1,40 @@
+
+<br>
+
+<br>
+<!-- Site types -->
+<div>
+    <dt>
+        <h5 id="arches-measurement-form" class="section-headline"> Sites in and around the Aleppo UNESCO WHS, Syria: </h5>
+    </dt>
+    
+</div>
+
+<br>
+
+<br>
+<!-- Service Blocks -->
+<div class="row margin-bottom-40">
+    <div class="col-sm-4">
+        <div class="servive-block servive-block-default">
+            <i class="icon-custom rounded-x icon-bg-dark fa fa-university"></i>
+            <a class= "" href='?page=1&termFilter=%5B%5B%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"Aleppo%20Reference"%2C"text"%3A"Aleppo%20Reference"%2C"value"%3A"Aleppo%20Reference"%7D%5D%5D&temporalFilter=%5B%7B"year_min_max"%3A%5B%5D%2C"filters"%3A%5B%5D%2C"inverted"%3Afalse%7D%5D&spatialFilter=%7B"geometry"%3A%7B"type"%3A""%2C"coordinates"%3A%5B%5D%7D%2C"buffer"%3A%7B"width"%3A"0"%2C"unit"%3A"m"%7D%2C"inverted"%3Afalse%7D&mapExpanded=true&timeExpanded=false&booleanSearch=and&searchRelatedResources=false&termFilterAndOr=%5B"and"%5D&termFilterCombineWithPrev=%5B%5Bfalse%5D%5D&termFilterGroup=%5B"No%20group"%5D&advancedSearch=false&include_ids=false'><h2 class="txt-color-blue">Aleppo Environs Heritage Places</h2></a><p>View a foundset of Heritage Places surrounding the Aleppo Citadel.</p>
+        </div>
+    </div>
+    
+    <div class="col-sm-4">
+        <div class="servive-block servive-block-default">
+            <i class="icon-custom rounded-x icon-bg-dark fa fa-university"></i>
+            <a class= "" href='?page=1&termFilter=%5B%5B%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"eamena-f"%2C"text"%3A"eamena-f"%2C"value"%3A"eamena-f"%7D%5D%5D&temporalFilter=%5B%7B"year_min_max"%3A%5B%5D%2C"filters"%3A%5B%5D%2C"inverted"%3Afalse%7D%5D&spatialFilter=%7B"geometry"%3A%7B"type"%3A""%2C"coordinates"%3A%5B%5D%7D%2C"buffer"%3A%7B"width"%3A"0"%2C"unit"%3A"m"%7D%2C"inverted"%3Afalse%7D&mapExpanded=true&timeExpanded=false&booleanSearch=and&searchRelatedResources=false&termFilterAndOr=%5B"and"%5D&termFilterCombineWithPrev=%5B%5Bfalse%5D%5D&termFilterGroup=%5B"No%20group"%5D&advancedSearch=false&include_ids=false'><h2 class="txt-color-blue">Aleppo Citadel UNESCO WHS Heritage Features</h2></a><p>View a foundset of Heritage Features within the UNESCO World Heritage Site of the Aleppo Citadel.</p>
+        </div>
+    </div>
+    
+    <div class="col-sm-4">
+        <div class="servive-block servive-block-default">
+            <i class="icon-custom rounded-x icon-bg-dark fa fa-university"></i>
+            <a class= "" href='?page=1&termFilter=%5B%5B%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"Aleppo%20Reference"%2C"text"%3A"Aleppo%20Reference"%2C"value"%3A"Aleppo%20Reference"%7D%2C%7B"inverted"%3Afalse%2C"type"%3A"string"%2C"context"%3A""%2C"context_label"%3A""%2C"id"%3A"EAMENA-F"%2C"text"%3A"EAMENA-F"%2C"value"%3A"EAMENA-F"%7D%5D%5D&temporalFilter=%5B%7B"year_min_max"%3A%5B%5D%2C"filters"%3A%5B%5D%2C"inverted"%3Afalse%7D%5D&spatialFilter=%7B"geometry"%3A%7B"type"%3A""%2C"coordinates"%3A%5B%5D%7D%2C"buffer"%3A%7B"width"%3A"0"%2C"unit"%3A"m"%7D%2C"inverted"%3Afalse%7D&mapExpanded=true&timeExpanded=false&booleanSearch=and&searchRelatedResources=false&termFilterAndOr=%5B"or"%5D&termFilterCombineWithPrev=%5B%5Bfalse%5D%5D&termFilterGroup=%5B"No%20group"%5D&advancedSearch=false&include_ids=true'><h2 class="txt-color-blue">Complete Aleppo Dataset</h2></a><p>See all heritage sites so far identifed and registered through the UNITAR/UNOSAT - EAMENA collaboration</p>
+        </div>
+    </div>
+</div>
+
+
diff --git a/search.htm b/search.htm
new file mode 100644
index 0000000000..11d65cdd17
--- /dev/null
+++ b/search.htm
@@ -0,0 +1,187 @@
+{% extends "base.htm" %}
+{% load i18n %}
+{% load staticfiles %}
+{% block css %}
+    {{ block.super }}
+    <link rel="stylesheet" href="{% static 'css/plugins/bootstrap-slider.min.css' %}">    
+{% endblock css%}
+{% block content %}
+
+<!--=== Search Block ===-->
+<div class="search-block" >
+    
+    <!-- Search Terms -->
+    <div class="container">
+        <div class="row">
+            
+            <!-- Search Widget -->
+            
+            <div class="col-xs-12 col-md-8 col-lg-9">
+                <div id="term-select-template" class="search-box-container hidden">
+                    <button class="btn btn-default toggle-combine-prev pull-left toggle-combine-off" type="button">
+                        <i class="fa toggle-inactive fa-circle-o"></i>
+                        <i class="fa toggle-active fa-check-circle-o"></i>
+                    </button>
+                    <input class="select2 arches-select2 pull-left term-search" name="" placeholder="{% trans "Search for a resource..." %}" value="">
+                    <button class="btn btn-success btn time-filter-button pull-left" style=""> 
+                        <i class="fa fa-clock-o" style="padding-right:8px;"></i>{% trans "Time Filter" %}
+                    </button>
+                    <span class="dropdown pull-left term-and-or">
+                        <button class="btn btn-default dropdown-toggle select-term-and-or" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                            <span class="term-and-or-value">And</span>
+                            <i class="fa fa-chevron-down"></i>
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="dropdown-grouped">
+                            <li><a href="#" class="search-term-and-or search-term-and" data-value='and'>And</a></li>
+                            <li><a href="#" class="search-term-and-or search-term-or" data-value='or'>Or</a></li>
+                        </ul>
+                    </span>                    <span class="dropdown pull-left term-group">
+                        <button class="btn btn-default dropdown-toggle select-term-groupping" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                            <span class="term-group-value">{% trans "No group" %}</span>
+                            <i class="fa fa-chevron-down"></i>
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="dropdown-grouped">
+                            <li><a href="#" class="search-grouped" data-value='No group'>{% trans "No group" %}</a></li>
+                            {% for option in group_options %}
+                                <li><a href="#" class="search-grouped" data-value='{{option.0}}'>{{option.1}}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </span>
+                </div>
+                <div class="form-group term-search-boxes">
+                    {% if 'edit' in user.user_groups %}
+                    <div class="global-and-or-container">
+                        <span class="dropdown pull-left global-and-or">
+                                <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                    <span>Global </span><span class="and-or-value">And</span>
+                                    <i class="fa fa-chevron-down"></i>
+                                </button>
+                                <ul class="dropdown-menu" aria-labelledby="dropdown-and-or">
+                                    <li><a href="#" class="search-and-or search-and">And</a></li>
+                                    <li><a href="#" class="search-and-or search-or">Or</a></li>
+                                </ul>
+                        </span>
+                    </div>
+                    {% endif %}
+                </div>
+                {% if 'edit' in user.user_groups %}
+                <div class="pull-left add-remove-search-box">
+                    <button class="btn btn-primary add-search-box" type="button">
+                        <i class="fa fa-plus"></i>
+                    </button>
+                    <button class="btn btn-danger remove-search-box" type="button">
+                        <i class="fa fa-remove"></i>
+                    </button>
+                </div>
+                {% endif %}
+            </div>
+            
+            <!-- End Search Widget -->
+
+
+            <!-- Advanced Search Option -->
+            <div class="col-xs-12 col-md-4 col-lg-3">
+              <div class="btn-group pull-right">
+                  <button type="button" class="btn btn-default advanced-search">
+                      <i class="fa fa-sliders" aria-hidden="true"></i>
+                  </button>
+
+                  <button class="btn btn-default toggle-related-resources toggle-related-off" type="button">
+                      <span class="term-group-value">
+                          <i class="fa fa-sitemap" style="padding: 0"></i>
+                      </span>
+                  </button>
+
+                {% if 'edit' in user.user_groups %}
+                <button class="btn btn-success btn" id="map-filter-button" style=""> 
+                    <i class="fa fa-minus invert-btn" style="margin-right: 7px;"></i>
+                    <i class="fa fa-map-marker" style="padding: 0 4px;"></i>
+                    <i class="fa fa-close close-btn" style="margin-right: 7px;"></i>
+                </button>
+                
+                {% else %}
+                <button class="btn btn-success btn" id="map-filter-button" style=""> 
+                    <i class="fa fa-minus invert-btn" style="margin-right: 7px;"></i>
+                    <i class="fa fa-map-marker" style="padding-right:8px;"></i>
+                    <i class="fa fa-close close-btn" style="margin-right: 7px;"></i>
+                </button>
+                {% endif %}
+
+                
+                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+                        {% trans "Tools" %}
+                        <i class="fa fa-chevron-down"></i>
+                        <span class="sr-only">{% trans "Toggle Dropdown" %}</span>                            
+                    </button>
+                    <ul class="dropdown-menu" role="menu">
+                        <li><a href="javascript:void(0);" id="view-saved-searches">{% trans "View Popular Searches" %}</a></li>
+                        <li class="divider"></li>
+                        {% if 'edit' in user.user_groups %}
+                        <li><a class="dataexport" id="shp" href="" target="_blank" onclick="return confirm('Warning: Shapefile export will truncate attributes to 250 characters')">{% trans "Export results to .SHP" %}</a></li>
+                        <li><a class="dataexport" id="csv" href="" target="_blank">{% trans "Export results to .CSV" %} </a></li>
+                        <li><a class="dataexport" id="kml" href="" target="_blank">{% trans "Export results to .KML" %} </a></li>
+                        <li><a class="dataexport" id="json" href="" target="_blank">{% trans "Export results to .JSON" %} </a></li>
+                       {% endif %}
+
+                        <li class="divider"></li>
+                        <li><a href="javascript:void(0);" id="clear-search">{% trans "Clear Search" %}</a></li>
+                    </ul>
+
+                </div>
+            </div>
+            <!-- End Advanced Search Option -->
+        </div>
+    </div>
+    <!-- End Search Terms -->  
+
+</div>    
+<!--=== End Search Block ===-->
+
+
+<!--=== Default Resource Summary ===-->
+<div class="container margin-bottom-50">
+
+    <div class="row" id="saved-searches" style="margin-left:0px; margin-right:0px;">
+        <!-- Results Header -->
+        <h2 style="margin-bottom:8px;">
+            <div class="row">        
+                <div class="col-xs-12">
+                    <span class="text-muted" style="margin-bottom: 5px;">{% trans "Directed Searches:" %}</span>
+                </div>
+
+            </div>
+        </h2>   
+        <!-- Results Header -->
+
+        {% include 'views/saved-searches.htm' %}
+    </div>
+
+    <div class="row" id="search-results" style="margin-left:0px; margin-right:0px;">
+       <!-- Results Header -->
+        <h2 style="margin-bottom:8px;">
+            <div class="row" id="search-results-count" data-count="">        
+                <div class="col-xs-12 col-lg-2" data-bind="if: total() >= 0">
+                    <span class="" style="font-size:23px;" data-bind="text: total() + ' {% trans "Results" %}'"></span>                               
+                </div>
+
+            </div>
+        </h2>   
+        <!-- Results Header -->      
+          
+        <div class="s-results margin-bottom-50">
+            <div class="row" id="map-filter-container" data-filtertext="{% trans "Map Filter Enabled" %}" style="margin-right: 20px;"> 
+                {% include 'views/search/map-filter.htm' %}
+            </div>
+            <div class="row hidden" id="time-filter-container-template" data-filtertext="{% trans "Time Filter Enabled" %}"> 
+                {% include 'views/search/time-filter.htm' %}
+            </div>
+            <div class="time-filters"></div>
+            <div class="row" id="search-results-container"> 
+                {% include 'views/search/search-results.htm' %}
+            </div>
+        </div>
+    </div>
+
+</div>
+
+{% endblock content %}