diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..70a0cb9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.apex
\ No newline at end of file
diff --git a/aura/sdg/sdg.cmp b/aura/sdg/sdg.cmp
index 219fdac..ad71610 100644
--- a/aura/sdg/sdg.cmp
+++ b/aura/sdg/sdg.cmp
@@ -161,18 +161,14 @@
                 </aura:set>
                 <aura:renderIf isTrue="{!v.ShowFilters}">
                     <div class="slds-p-bottom_small">
-                        <lightning:layout multipleRows="true">
                             <aura:iteration items="{!v.SDGFiltersDefinition}" var="field">
-                                <lightning:layoutItem flexibility="auto" size="{!v.filtersize}">
                                     <div class="{! 'filter ' + v.TargetSize}">
                                         <c:sdgFilter aura:id="cmpFilter" SDGField="{!field}">
 
                                         </c:sdgFilter>
                                     </div>
-                                </lightning:layoutItem>
                             </aura:iteration>
 
-                        </lightning:layout>
                     </div>
                 </aura:renderIf>
 
diff --git a/aura/sdg/sdg.css b/aura/sdg/sdg.css
index aa1c131..09798a2 100644
--- a/aura/sdg/sdg.css
+++ b/aura/sdg/sdg.css
@@ -172,7 +172,7 @@ font-size:0.9em;
 
 }
 .THIS .filter{
-width:100%;
+    display: inline-block;
 }
 
 .THIS .slds-table.narrow tr {
diff --git a/aura/sdg/sdgHelper.js b/aura/sdg/sdgHelper.js
index d6a583f..09c9de4 100644
--- a/aura/sdg/sdgHelper.js
+++ b/aura/sdg/sdgHelper.js
@@ -83,7 +83,7 @@
 
             for (var i = 0; i < fieldlistlength; i++) {
               var field = fields[i];
-              if (field.canFilter) hasFilters === true;
+              if (field.canFilter) hasFilters = true;
               if (
                 field.FieldStyle &&
                 field.FieldStyle.startsWith("Summarize")
diff --git a/aura/sdgFilter/sdgFilter.cmp b/aura/sdgFilter/sdgFilter.cmp
index 6ae0845..470ae6d 100644
--- a/aura/sdgFilter/sdgFilter.cmp
+++ b/aura/sdgFilter/sdgFilter.cmp
@@ -60,8 +60,8 @@
                 <div class="slds-grid slds-wrap">
 
                     <aura:if isTrue="{!v.isString}">
-                        <div class="slds-col slds-col_padded">
-                            <lightning:select aura:id="StringOperatorField" value="{!v.FilterOperatorPreference}" label="{!v.SDGField.Label}" onchange="{!c.updateString}">
+                        <div class="slds-col slds-col_padded sdg-combo-filter slds-grid">
+                            <lightning:select aura:id="StringOperatorField" label="{!v.SDGField.Label}" value="{!v.FilterOperatorPreference}" onchange="{!c.updateString}">
                                 <option text="=" label="{!v.sdgEquals}" />
                                 <option value="NOT=" label="{!v.sdgNotEquals}" />
                                 <option value="STARTS" label="{!v.sdgStarts}" selected="true" />
@@ -70,15 +70,15 @@
                                 <option value="NOTCONTAINS" label="{!v.sdgNotContains}" />
                             </lightning:select>
 
-                        </div>
-                        <div class="slds-col slds-col_padded">
-                            <label class="slds-form-element__label">&nbsp;</label>
-                            <ui:inputText change="{!c.updateString}" aura:id="StringField" value="{!v.FilterValuePreference}" />
+                            <div class="slds-col slds-grow sdg-filter-input-text">
+                                <label class="slds-hide">&nbsp;</label>
+                                <ui:inputText change="{!c.updateString}" aura:id="StringField" value="{!v.FilterValuePreference}" />
+                            </div>
                         </div>
                     </aura:if>
 
                     <aura:if isTrue="{!v.isDate}">
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
+                        <div class="slds-col slds-col_padded sdg-combo-filter slds-grid">
                             <lightning:select aura:id="DateOperatorField" label="{!v.SDGField.Label}" value="{!v.FilterOperatorPreference}" onchange="{!c.updateDate}">
                                 <option text="=" label="{!v.sdgEquals}" />
                                 <option text="GT" label="{!v.sdgAfter}" />
@@ -101,9 +101,7 @@
                                 <option text="LAST_YEAR" label="{!v.sdgLastYear}" />
                             </lightning:select>
 
-                        </div>
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
-                            <label class="slds-form-element__label">&nbsp;</label>
+                            <label class="slds-hide">&nbsp;</label>
                             <ui:inputDate aura:id="DateField" change="{!c.updateDate}" value="{!v.DateValue}" displayDatePicker="true" />
                         </div>
 
@@ -130,7 +128,7 @@
 
 
                     <aura:if isTrue="{!v.isNumber}">
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
+                        <div class="slds-col slds-col_padded sdg-combo-filter slds-grid">
 
                             <lightning:select aura:id="NumberOperatorField" label="{!v.SDGField.Label}" value="{!v.NumberOperator}" onchange="{!c.updateNumber}">
                                 <option text="=" label="{!v.sdgEquals}" />
@@ -138,10 +136,11 @@
                                 <option text="LT" label="{!v.sdgLessThan}" />
 
                             </lightning:select>
-                        </div>
-                        <div class="slds-col slds-size_1-of-1 slds-medium-size_1-of-2 slds-col_padded">
-                            <label class="slds-form-element__label">&nbsp;</label>
-                            <ui:inputNumber aura:id="NumberField" value="{!v.FilterValuePreference}" change="{!c.updateNumber}" />
+
+                            <div class="slds-col slds-grow sdg-filter-input-number">
+                                <label class="slds-hide">&nbsp;</label>
+                                <ui:inputNumber aura:id="NumberField" value="{!v.FilterValuePreference}" change="{!c.updateNumber}" />
+                            </div>
                         </div>
                     </aura:if>
                 </div>
diff --git a/aura/sdgFilter/sdgFilter.css b/aura/sdgFilter/sdgFilter.css
index 22b37d6..3388eea 100644
--- a/aura/sdgFilter/sdgFilter.css
+++ b/aura/sdgFilter/sdgFilter.css
@@ -1,3 +1,48 @@
-.THIS .filter_label {
-    text-align: left;
+.THIS .slds-form-element__label {
+    display: block;
 }
+
+.THIS .slds-form-element__control, .THIS .slds-form-element, .THIS .slds-select_container, .THIS div.uiInput {
+    display: inline-block;
+}
+
+.THIS .uiInputText.input, .THIS .uiInputNumber.input, .THIS .uiInputDate .input {
+    border-radius: 0 .25rem .25em 0;
+}
+
+.THIS div.uiInputDate {
+    -webkit-box-flex: 1;
+    -webkit-flex-grow: 1;
+    -ms-flex-positive: 1;
+    flex-grow: 1;
+}
+
+.THIS .sdg-combo-filter .slds-select {
+    border-radius: .25rem 0 0 .25em;
+}
+
+.THIS .slds-select {
+    height: 36px;
+}
+
+.THIS .sdg-combo-filter {
+    position: relative;
+    padding-top: 1.7em;
+}
+
+.THIS .sdg-combo-filter label {
+    position: absolute;
+    top: -1.7em;
+}
+
+.THIS .sdg-filter-input-text {
+    min-width: 200px;
+}
+
+.THIS .sdg-filter-input-number {
+    min-width: 176px;
+}
+
+.THIS .uiInput--datetime .datePicker-openIcon {
+    bottom: 11px;
+}
\ No newline at end of file
diff --git a/classes/sdgQueryBuilder.cls b/classes/sdgQueryBuilder.cls
index a21383a..e1a42ac 100644
--- a/classes/sdgQueryBuilder.cls
+++ b/classes/sdgQueryBuilder.cls
@@ -30,7 +30,7 @@ global static string BuildFilterClause(String ColumnName, String FieldType, Stri
     if (string.isblank(filteroperator))
             filteroperator = '=';
 
-            if (FieldType ==String.valueof(Schema.DisplayType.STRING))
+            if (FieldType ==String.valueof(Schema.DisplayType.STRING) || FieldType ==String.valueof(Schema.DisplayType.EMAIL))
             {
                 if (String.isNotBlank(filtervalue.trim()))
                 {
diff --git a/labels/CustomLabels.labels b/labels/CustomLabels.labels
index 75c5c00..eda2f34 100644
--- a/labels/CustomLabels.labels
+++ b/labels/CustomLabels.labels
@@ -46,8 +46,8 @@
         <fullName>sdgFalse</fullName>
         <language>en_US</language>
         <protected>false</protected>
-        <shortDescription>False</shortDescription>
-        <value>False</value>
+        <shortDescription>No</shortDescription>
+        <value>No</value>
     </labels>
     <labels>
         <fullName>sdgFiltered</fullName>
@@ -228,8 +228,8 @@
         <fullName>sdgTrue</fullName>
         <language>en_US</language>
         <protected>false</protected>
-        <shortDescription>True</shortDescription>
-        <value>True</value>
+        <shortDescription>Yes</shortDescription>
+        <value>Yes</value>
     </labels>
     <labels>
         <fullName>sdgView_All</fullName>
diff --git a/package.xml b/package.xml
index cf0aea9..6838289 100644
--- a/package.xml
+++ b/package.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
   <types>
-    <name>CustomApplication</name>
-    <members>Sortable_Data_Grids_Lightning</members>
-  </types>
-  <types>
-    <name>AuraDefinitionBundle</name>
-    <members>ObjectHelper</members>
-    <members>SDGFieldChooser</members>
-    <members>SDGImportExport</members>
-    <members>evtRefreshSDG</members>
-    <members>sdg</members>
-    <members>sdgBase</members>
-    <members>sdgDatagridCell</members>
-    <members>sdgDesignerFieldFinder</members>
-    <members>sdgFilter</members>
-    <members>sdgFilterUpdate</members>
-    <members>sdgHelp</members>
-    <members>sdgList</members>
-    <members>sdgSortableColumn</members>
-    <members>sdgSortableColumnSort</members>
-  </types>
-  <types>
-    <name>ApexClass</name>
     <members>AuraFieldSelectOption</members>
     <members>AuraSelectOption</members>
     <members>AuraSelectOptionTest</members>
@@ -83,139 +61,83 @@
     <members>sdgTestData</members>
     <members>sdgVerification</members>
     <members>sdgVerificationTest</members>
+    <name>ApexClass</name>
   </types>
   <types>
-    <name>CustomMetadata</name>
-    <members>SDGDefaults.SDG_Designer_Actions</members>
-    <members>SDGDefaults.SDG_Designer_Fields</members>
+    <members>trgSDG</members>
+    <members>trgSDGField</members>
+    <name>ApexTrigger</name>
   </types>
   <types>
-    <name>FlexiPage</name>
-    <members>Sortable_Data_Grid_Action_Record_Page</members>
-    <members>Sortable_Data_Grid_Field_Record_Page</members>
-    <members>Sortable_Data_Grid_Record_Page</members>
+    <members>ObjectHelper</members>
+    <members>SDGFieldChooser</members>
+    <members>SDGImportExport</members>
+    <members>evtRefreshSDG</members>
+    <members>sdg</members>
+    <members>sdgBase</members>
+    <members>sdgDatagridCell</members>
+    <members>sdgDesignerFieldFinder</members>
+    <members>sdgFilter</members>
+    <members>sdgFilterUpdate</members>
+    <members>sdgHelp</members>
+    <members>sdgList</members>
+    <members>sdgSortableColumn</members>
+    <members>sdgSortableColumnSort</members>
+    <name>AuraDefinitionBundle</name>
   </types>
   <types>
-    <name>CustomLabels</name>
-    <members>CustomLabels</members>
+    <members>Sortable_Data_Grids_Lightning</members>
+    <name>CustomApplication</name>
   </types>
   <types>
-    <name>CustomLabel</name>
-    <members>*</members>
+    <members>CustomLabels</members>
+    <name>CustomLabels</name>
   </types>
   <types>
-    <name>Layout</name>
-    <members>SDGDefaults__mdt-Main</members>
-    <members>SDG_Action__c-SDG Action Layout</members>
-    <members>SDG_Field__c-Field Layout</members>
-    <members>SDG__c-SDG Layout</members>
-    <members>sdg_Preferences__c-Sortable Data Grid Preference Layout</members>
+    <members>SDGDefaults.SDG_Designer_Actions</members>
+    <members>SDGDefaults.SDG_Designer_Fields</members>
+    <name>CustomMetadata</name>
   </types>
   <types>
-    <name>CustomObject</name>
     <members>SDGDefaults__mdt</members>
     <members>SDG_Action__c</members>
     <members>SDG_Field__c</members>
     <members>SDG__c</members>
     <members>sdg_Preferences__c</members>
+    <name>CustomObject</name>
   </types>
   <types>
-    <name>CustomField</name>
-    <members>SDGDefaults__mdt.Definition__c</members>
-    <members>SDG_Action__c.Action_Order__c</members>
-    <members>SDG_Action__c.Action_Type__c</members>
-    <members>SDG_Action__c.Event_Payload__c</members>
-    <members>SDG_Action__c.Event__c</members>
-    <members>SDG_Action__c.Icon__c</members>
-    <members>SDG_Action__c.Requires_Createable__c</members>
-    <members>SDG_Action__c.Requires_Deletable__c</members>
-    <members>SDG_Action__c.Requires_Editable__c</members>
-    <members>SDG_Action__c.SDG__c</members>
-    <members>SDG_Field__c.APIName__c</members>
-    <members>SDG_Field__c.FieldOrder__c</members>
-    <members>SDG_Field__c.Field_Style__c</members>
-    <members>SDG_Field__c.Hide_Filter__c</members>
-    <members>SDG_Field__c.Override_Label__c</members>
-    <members>SDG_Field__c.is_valid_field__c</members>
-    <members>SDG_Field__c.sdg__c</members>
-    <members>SDG__c.All_Rows__c</members>
-    <members>SDG__c.Default_Sort__c</members>
-    <members>SDG__c.DisableSharing__c</members>
-    <members>SDG__c.Filter__c</members>
-    <members>SDG__c.Is_Valid__c</members>
-    <members>SDG__c.Parent_Field_Name__c</members>
-    <members>SDG__c.SDG_Tag__c</members>
-    <members>SDG__c.sObjectName__c</members>
-    <members>sdg_Preferences__c.Filters__c</members>
-    <members>sdg_Preferences__c.User__c</members>
-    <members>sdg_Preferences__c.sdgKey__c</members>
-  </types>
-  <types>
-    <name>ValidationRule</name>
-    <members>SDG_Action__c.Payload_must_end_with_brace</members>
-    <members>SDG_Action__c.Payload_must_start_with_brace</members>
-    <members>SDG__c.Make_sObjectName_Mandatory</members>
+    <members>SDG__c</members>
+    <name>CustomTab</name>
   </types>
   <types>
-    <name>FieldSet</name>
-    <members>SDG_Field__c.Default</members>
-    <members>SDG__c.default</members>
+    <members>Sortable_Data_Grid_Action_Record_Page</members>
+    <members>Sortable_Data_Grid_Field_Record_Page</members>
+    <members>Sortable_Data_Grid_Record_Page</members>
+    <name>FlexiPage</name>
   </types>
   <types>
-    <name>ListView</name>
-    <members>SDG__c.All</members>
+    <members>SDGDefaults__mdt-Main</members>
+    <members>SDG_Action__c-SDG Action Layout</members>
+    <members>SDG_Field__c-Field Layout</members>
+    <members>SDG__c-SDG Layout</members>
+    <members>sdg_Preferences__c-Sortable Data Grid Preference Layout</members>
+    <name>Layout</name>
   </types>
   <types>
-    <name>PermissionSet</name>
     <members>Edit_Sortable_Data_Grids</members>
     <members>Sortable_Data_Grids_ManageSharing</members>
     <members>View_Sortable_Data_Grids</members>
+    <name>PermissionSet</name>
   </types>
   <types>
-    <name>QuickAction</name>
     <members>SDG__c.Export_Wizard</members>
     <members>SDG__c.Help</members>
+    <name>QuickAction</name>
   </types>
   <types>
-    <name>CustomTab</name>
     <members>SDG__c</members>
-  </types>
-  <types>
-    <name>ApexTrigger</name>
-    <members>trgSDG</members>
-    <members>trgSDGField</members>
-  </types>
-  <types>
     <name>Workflow</name>
-    <members>SDG__c</members>
-  </types>
-  <types>
-    <name>WorkflowFieldUpdate</name>
-    <members>*</members>
-  </types>
-  <types>
-    <name>WorkflowKnowledgePublish</name>
-    <members>*</members>
-  </types>
-  <types>
-    <name>WorkflowTask</name>
-    <members>*</members>
-  </types>
-  <types>
-    <name>WorkflowAlert</name>
-    <members>*</members>
-  </types>
-  <types>
-    <name>WorkflowSend</name>
-    <members>*</members>
-  </types>
-  <types>
-    <name>WorkflowOutboundMessage</name>
-    <members>*</members>
-  </types>
-  <types>
-    <name>WorkflowRule</name>
-    <members>*</members>
   </types>
   <version>41.0</version>
 </Package>
\ No newline at end of file