diff --git a/ansibleworks/ui/static/js/forms/JobTemplates.js b/ansibleworks/ui/static/js/forms/JobTemplates.js
index 4801d136c3..e41a6c6cd7 100644
--- a/ansibleworks/ui/static/js/forms/JobTemplates.js
+++ b/ansibleworks/ui/static/js/forms/JobTemplates.js
@@ -166,18 +166,39 @@ angular.module('JobTemplateFormDefinition', [])
                 type: 'collection',
                 title: 'Jobs',
                 iterator: 'job',
+                index: false,
                 open: false,
                 
                 actions: { 
                     },
                 
                 fields: {
-                    name: {
+                    id: {
+                        label: 'Job ID',
                         key: true,
-                        label: 'Name'
+                        desc: true,
+                        searchType: 'int'   
+                        },
+                    name: {
+                        label: 'Name',
+                        link: true
                         },
                     description: {
                         label: 'Description'
+                        },
+                    status: {
+                        label: 'Status',
+                        icon: 'icon-circle',
+                        "class": 'job-\{\{ job.status \}\}',
+                        searchType: 'select',
+                        searchOptions: [
+                            { name: "new", value: "new" }, 
+                            { name: "pending", value: "pending" },
+                            { name: "running", value: "running" }, 
+                            { name: "successful", value: "successful" },
+                            { name: "error", value: "error" },
+                            { name: "failed", value: "failed" },
+                            { name: "canceled", value: "canceled" } ]
                         }
                     },
                 
diff --git a/ansibleworks/ui/static/js/helpers/related-search.js b/ansibleworks/ui/static/js/helpers/related-search.js
index 26cb13739b..82ad4ab5ab 100644
--- a/ansibleworks/ui/static/js/helpers/related-search.js
+++ b/ansibleworks/ui/static/js/helpers/related-search.js
@@ -24,28 +24,67 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities','RefreshRelat
         var form = params.form; 
         
         // Set default values
+        var iterator, f;
         for (var set in form.related) {
             if (form.related[set].type != 'tree') {
+                iterator = form.related[set].iterator;
                 for (var fld in form.related[set].fields) {
                     if (form.related[set].fields[fld].key) {
-                       scope[form.related[set].iterator + 'SearchField'] = fld
-                       scope[form.related[set].iterator + 'SearchFieldLabel'] = form.related[set].fields[fld].label;
+                       scope[iterator + 'SearchField'] = fld
+                       scope[iterator + 'SearchFieldLabel'] = form.related[set].fields[fld].label;
                        break;
                     }
                 }
-                scope[form.related[set].iterator + 'SortOrder'] = null;
-                scope[form.related[set].iterator + 'SearchType'] = 'contains';
-                scope[form.related[set].iterator + 'SearchTypeLabel'] = 'Contains';
-                scope[form.related[set].iterator + 'SelectShow'] = false;
-                scope[form.related[set].iterator + 'HideSearchType'] = false;
+                scope[iterator + 'SortOrder'] = null;
+                scope[iterator + 'SearchType'] = 'contains';
+                scope[iterator + 'SearchTypeLabel'] = 'Contains';
+                scope[iterator + 'SelectShow'] = false;
+                scope[iterator + 'HideSearchType'] = false;
+                f = scope[iterator + 'SearchField']
+                if (form.related[set].fields[f].searchType && ( form.related[set].fields[f].searchType == 'boolean' 
+                      || form.related[set].fields[f].searchType == 'select')) {
+                   scope[iterator + 'SelectShow'] = true;
+                   scope[iterator + 'SearchSelectOpts'] = list.fields[f].searchOptions;
+                }
+                if (form.related[set].fields[f].searchType && form.related[set].fields[f].searchType == 'int') {
+                   scope[iterator + 'HideSearchType'] = true;   
+                }
+                if (form.related[set].fields[f].searchType && form.related[set].fields[f].searchType == 'gtzero') {
+                      scope[iterator + "InputHide"] = true;
+                }
             }
         } 
         
         // Functions to handle search widget changes
-        scope.setSearchField = function(model, fld, label) {
-           scope[model + 'SearchFieldLabel'] = label;
-           scope[model + 'SearchField'] = fld;
-           scope.search(model);
+        scope.setSearchField = function(iterator, fld, label) {
+           
+           for (var related in form.related) {
+               if ( form.related[related].iterator == iterator ) {
+                  var f = form.related[set].fields[fld];
+               }
+           }
+           
+           scope[iterator + 'SearchFieldLabel'] = label;
+           scope[iterator + 'SearchField'] = fld;
+           scope[iterator + 'SearchValue'] = '';
+           scope[iterator + 'SelectShow'] = false;
+           scope[iterator + 'HideSearchType'] = false;
+           scope[iterator + 'InputHide'] = false;
+           
+           if (f.searchType && f.searchType == 'gtzero') {
+              scope[iterator + "InputHide"] = true;
+           }
+           if (f.searchType && (f.searchType == 'boolean' 
+                || f.searchType == 'select')) {
+              scope[iterator + 'SelectShow'] = true;
+              scope[iterator + 'SearchSelectOpts'] = f.searchOptions;
+           }
+           if (f.searchType && f.searchType == 'int') {
+              scope[iterator + 'HideSearchType'] = true;   
+           }
+
+           scope.search(iterator);
+
            }
 
         scope.setSearchType = function(model, type, label) {
@@ -54,38 +93,71 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities','RefreshRelat
            scope.search(model);
            }
 
-        scope.search = function(model) {
-           scope[model + 'SearchSpin'] = true;
-           scope[model + 'Loading'] = true;
+        scope.search = function(iterator) {
+           scope[iterator + 'SearchSpin'] = true;
+           scope[iterator + 'Loading'] = true;
            
            var set, url, iterator, sort_order;
            for (var key in relatedSets) {
-               if (relatedSets[key].iterator == model) {
+               if (relatedSets[key].iterator == iterator) {
                   set = key;
-                  iterator = relatedSets[key].iterator;
                   url = relatedSets[key].url;
-                 
                   for (var fld in form.related[key].fields) {
                       if (form.related[key].fields[fld].key) {
-                         sort_order = fld;
+                         if (form.related[key].fields[fld].desc) {
+                            sort_order = '-' + fld;
+                         }
+                         else {
+                            sort_order = fld;
+                         }
                       }
                   }
                   break;
                }
            }
 
-           sort_order = (scope[model + 'SortOrder'] == null) ? sort_order : scope[model + 'SortOrder'];
+           sort_order = (scope[iterator + 'SortOrder'] == null) ? sort_order : scope[iterator + 'SortOrder'];
 
-           if (scope[model + 'SearchValue'] != '' && scope[model + 'SearchValue'] != undefined) {
-              scope[model + 'SearchParams'] = '?' + scope[model + 'SearchField'] + 
-                     '__' + scope[model + 'SearchType'] + '=' + escape(scope[model + 'SearchValue']);
-              scope[model + 'SearchParams'] += (sort_order) ? '&order_by=' + escape(sort_order) : '';
+           var f = form.related[set].fields[scope[iterator + 'SearchField']];
+           if ( (scope[iterator + 'SelectShow'] == false && scope[iterator + 'SearchValue'] != '' && scope[iterator + 'SearchValue'] != undefined) ||
+                (scope[iterator + 'SelectShow'] && scope[iterator + 'SearchSelectValue']) || (f.searchType && f.searchType == 'gtzero') ) {
+              if (f.sourceModel) {
+                 // handle fields whose source is a related model e.g. inventories.organization
+                 scope[iterator + 'SearchParams'] = '?' + f.sourceModel + '__' + f.sourceField + '__';
+              }
+              else if (f.searchField) {
+                 scope[iterator + 'SearchParams'] = '?' + f.searchField + '__'; 
+              }
+              else {
+                 scope[iterator + 'SearchParams'] = '?' + scope[iterator + 'SearchField'] + '__'; 
+              }
+              
+              if ( f.searchType && (f.searchType == 'int' || f.searchType == 'boolean' ) ) {
+                 scope[iterator + 'SearchParams'] += 'int=';  
+              }
+              else if ( f.searchType && f.searchType == 'gtzero' ) {
+                 scope[iterator + 'SearchParams'] += 'gt=0'; 
+              }
+              else {
+                 scope[iterator + 'SearchParams'] += scope[iterator + 'SearchType'] + '='; 
+              }             
+              
+              if ( f.searchType && (f.searchType == 'boolean' || f.searchType == 'select') ) { 
+                   scope[iterator + 'SearchParams'] += scope[iterator + 'SearchSelectValue'].value;
+              }
+              else if ( f.searchType == undefined || f.searchType == 'gtzero' ) {
+                 scope[iterator + 'SearchParams'] += escape(scope[iterator + 'SearchValue']);
+              }
+              scope[iterator + 'SearchParams'] += (sort_order) ? '&order_by=' + escape(sort_order) : '';
            }
            else {
-              scope[model + 'SearchParams'] = (sort_order) ? '?order_by=' + escape(sort_order) : '';
+              scope[iterator + 'SearchParams'] = ''; 
+              scope[iterator + 'SearchParams'] += (sort_order) ? '?order_by=' + escape(sort_order) : '';
            }
-           url += scope[model + 'SearchParams'];
-           url += (scope[model + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : "";
+
+           scope[iterator + 'Page'] = 0;
+           url += scope[iterator + 'SearchParams'];
+           url += (scope[iterator + 'PageSize']) ? '&page_size=' + scope[iterator + 'PageSize'] : "";
            RefreshRelated({ scope: scope, set: set, iterator: iterator, url: url });
            }
 
diff --git a/ansibleworks/ui/static/lib/ansible/form-generator.js b/ansibleworks/ui/static/lib/ansible/form-generator.js
index 1cdb0db24d..b317bf8dc9 100644
--- a/ansibleworks/ui/static/lib/ansible/form-generator.js
+++ b/ansibleworks/ui/static/lib/ansible/form-generator.js
@@ -52,6 +52,9 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
            case 'dataPlacement':
                result = "data-placement=\"" + obj[key] + "\" ";
                break;
+           case 'icon':
+               result = "<i class=\"" + obj[key] +"\"></i> ";
+               break;
            default: 
                result = key + "=\"" + obj[key] + "\" ";
        }
@@ -885,7 +888,7 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
                  html += "<table class=\"" + form.related[itm].iterator + " table table-condensed table-hover\">\n";
                  html += "<thead>\n";
                  html += "<tr>\n";
-                 html += "<th>#</th>\n";
+                 html += (form.related[itm].index == undefined || form.related[itm].index !== false) ? "<th>#</th>\n" : "";
                  for (var fld in form.related[itm].fields) {
                      html += "<th class=\"list-header\" id=\"" + form.related[itm].iterator + '-' + fld + "-header\" " +
                          "ng-click=\"sort('" + form.related[itm].iterator + "', '" + fld + "')\">" +
@@ -911,8 +914,10 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
                  html += "<tbody>\n";
                 
                  html += "<tr ng-repeat=\"" + form.related[itm].iterator + " in " + itm + "\" >\n";
-                 html += "<td>{{ $index + (" + form.related[itm].iterator + "Page * " + 
-                         form.related[itm].iterator + "PageSize) + 1 }}.</td>\n";
+                 if (form.related[itm].index == undefined || form.related[itm].index !== false) {
+                    html += "<td>{{ $index + (" + form.related[itm].iterator + "Page * " + 
+                        form.related[itm].iterator + "PageSize) + 1 }}.</td>\n";
+                 }
                  var cnt = 1;
                  var rfield;
                  var base = (form.related[itm].base) ? form.related[itm].base : itm;
@@ -920,7 +925,10 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
                  for (var fld in form.related[itm].fields) {
                      cnt++;
                      rfield = form.related[itm].fields[fld];
-                     html += "<td>";
+                     html += "<td "; 
+                     html += (rfield['class']) ? 'class="'+ rfield['class'] + '"' : "";
+                     html += ">";
+                     html += (rfield.icon) ? this.attr(rfield,'icon') : "";
                      if ((rfield.key || rfield.link || rfield.linkTo || rfield.ngClick )) {
                         if (rfield.linkTo) {
                            html += "<a href=\"#" + rfield.linkTo + "\">";