diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb
index 2709a5cd58..61459c8ecc 100755
--- a/app/controllers/customers_controller.rb
+++ b/app/controllers/customers_controller.rb
@@ -72,41 +72,10 @@ def auto_complete_for_customer_name
   end
 
   def search
-    search_criteria = params[:term].strip
-
-    @customers = []
-    @users = []
-    @tasks = []
-    @projects = []
-    @resources = []
-    @limit = 5
-    unless search_criteria.blank?
-      if search_criteria.to_i > 0
-
-        @tasks = TaskRecord.all_accessed_by(current_user).where(:task_num => search_criteria)
-      elsif params[:entity]
-        @limit = 100000
-        if params[:entity] =~ /user/
-          @users = current_user.company.users.where('lower(name) LIKE ?', '%' + search_criteria.downcase + '%').where(:active => true)
-        elsif params[:entity] =~ /customer/
-          @customers = current_user.company.customers.where('lower(name) LIKE ?', '%' + search_criteria.downcase + '%').where(:active => true)
-        elsif params[:entity] =~ /task/
-          @tasks = TaskRecord.all_accessed_by(current_user).where('lower(tasks.name) LIKE ?', '%' + search_criteria.downcase + '%').where('tasks.status = 0')
-        elsif params[:entity] =~ /resource/
-          @resources = current_user.company.resources.where('lower(name) like ?', '%' + search_criteria.downcase + '%') if current_user.use_resources?
-        elsif params[:entity] =~ /project/
-          @projects = current_user.projects.where('lower(name) like ?', '%' + search_criteria.downcase + '%')
-        end
-      else
-        @customers = current_user.company.customers.where('lower(name) LIKE ?', '%' + search_criteria.downcase + '%').where(:active => true)
-        @users = current_user.company.users.where('lower(name) LIKE ?', '%' + search_criteria.downcase + '%').where(:active => true)
-        @tasks = TaskRecord.all_accessed_by(current_user).where('lower(tasks.name) LIKE ?', '%' + search_criteria.downcase + '%').where('tasks.status = 0')
-        @resources = current_user.company.resources.where('lower(name) like ?', '%' + search_criteria.downcase + '%') if current_user.use_resources?
-        @projects = current_user.projects.where('lower(name) like ?', '%' + search_criteria.downcase + '%')
-      end
-    end
+    search_result = ::Searching::CustomerService.new(params[:term].strip, params[:entity], current_user).perform
+
+    html = render_to_string :partial => 'customers/search_autocomplete', :locals => search_result
 
-    html = render_to_string :partial => 'customers/search_autocomplete', :locals => {:users => @users, :customers => @customers, :tasks => @tasks, :projects => @projects, :resources => @resources, :limit => @limit}
     render :json => {:success => true, :html => html}
   end
 
@@ -134,4 +103,3 @@ def customer_attributes
                                      :set_custom_attribute_values => [:custom_attribute_id, :choice_id, :value]
   end
 end
-
diff --git a/app/services/searching/base_service.rb b/app/services/searching/base_service.rb
new file mode 100644
index 0000000000..448deaa322
--- /dev/null
+++ b/app/services/searching/base_service.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Searching
+  class BaseService
+    def initialize(current_user, search_criteria, limit)
+      @current_user = current_user
+      @search_criteria = search_criteria
+      @resources = []
+      @limit = limit
+    end
+  end
+end
diff --git a/app/services/searching/by_all_entities_service.rb b/app/services/searching/by_all_entities_service.rb
new file mode 100644
index 0000000000..de0ba54b88
--- /dev/null
+++ b/app/services/searching/by_all_entities_service.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module ::Searching
+  class ByAllEntitiesService < Searching::BaseService
+    attr_reader :current_user, :search_criteria, :limit
+
+    def perform
+      @customers = ::Searching::ByEntity::CustomersService.new(current_user, search_criteria, limit).perform
+      @users = ::Searching::ByEntity::UsersService.new(current_user, search_criteria, limit).perform
+      @tasks = ::Searching::ByEntity::TasksService.new(current_user, search_criteria, limit).perform
+
+      if current_user.use_resources?
+        @resources = ::Searching::ByEntity::ResourcesService.new(current_user, search_criteria,
+                                                                 limit).perform
+      end
+
+      @projects = ::Searching::ByEntity::ProjectsService.new(current_user, search_criteria, limit).perform
+
+      result
+    end
+
+    private
+
+    def result
+      { tasks: @tasks, users: @users, customers: @customers, resources: @resources, projects: @projects, limit: @limit }
+    end
+  end
+end
diff --git a/app/services/searching/by_entity/customers_service.rb b/app/services/searching/by_entity/customers_service.rb
new file mode 100644
index 0000000000..9130540cc3
--- /dev/null
+++ b/app/services/searching/by_entity/customers_service.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Searching
+  module ByEntity
+    class CustomersService < Searching::BaseService
+      attr_reader :current_user, :search_criteria
+
+      def perform
+        current_user.company.customers.where('lower(name) LIKE ?',
+                                             "%#{search_criteria.downcase}%").where(active: true)
+      end
+    end
+  end
+end
diff --git a/app/services/searching/by_entity/projects_service.rb b/app/services/searching/by_entity/projects_service.rb
new file mode 100644
index 0000000000..937265d2fd
--- /dev/null
+++ b/app/services/searching/by_entity/projects_service.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Searching
+  module ByEntity
+    class ProjectsService < Searching::BaseService
+      attr_reader :current_user, :search_criteria
+
+      def perform
+        current_user.projects.where('lower(name) like ?', "%#{search_criteria.downcase}%")
+      end
+    end
+  end
+end
diff --git a/app/services/searching/by_entity/resources_service.rb b/app/services/searching/by_entity/resources_service.rb
new file mode 100644
index 0000000000..75b67b6bae
--- /dev/null
+++ b/app/services/searching/by_entity/resources_service.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Searching
+  module ByEntity
+    class ResourcesService < Searching::BaseService
+      attr_reader :current_user, :search_criteria
+
+      def perform
+        current_user.company.resources.where('lower(name) like ?', "%#{search_criteria.downcase}%")
+      end
+    end
+  end
+end
diff --git a/app/services/searching/by_entity/tasks_service.rb b/app/services/searching/by_entity/tasks_service.rb
new file mode 100644
index 0000000000..7180fb0009
--- /dev/null
+++ b/app/services/searching/by_entity/tasks_service.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Searching
+  module ByEntity
+    class TasksService < Searching::BaseService
+      attr_reader :current_user, :search_criteria
+
+      def perform
+        TaskRecord.all_accessed_by(current_user).where('lower(tasks.name) LIKE ?',
+                                                       "%#{search_criteria.downcase}%").where('tasks.status = 0')
+      end
+    end
+  end
+end
diff --git a/app/services/searching/by_entity/users_service.rb b/app/services/searching/by_entity/users_service.rb
new file mode 100644
index 0000000000..f8e2098a9c
--- /dev/null
+++ b/app/services/searching/by_entity/users_service.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Searching
+  module ByEntity
+    class UsersService < Searching::BaseService
+      attr_reader :current_user, :search_criteria
+
+      def perform
+        current_user.company.users.where('lower(name) LIKE ?', "%#{search_criteria.downcase}%").where(active: true)
+      end
+    end
+  end
+end
diff --git a/app/services/searching/customer_service.rb b/app/services/searching/customer_service.rb
new file mode 100644
index 0000000000..f1569362ee
--- /dev/null
+++ b/app/services/searching/customer_service.rb
@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Searching
+  class CustomerService
+    def initialize(search_criteria, entity, current_user)
+      @search_criteria = search_criteria
+      @customers = []
+      @users = []
+      @tasks = []
+      @projects = []
+      @resources = []
+      @entity = entity
+      @limit = entity.present? ? 1_000_000 : 5
+      @current_user = current_user
+    end
+
+    def perform
+      raise 'Search term required' if search_criteria.blank?
+
+      if search_criteria.to_i.positive?
+        search_all_tasks
+      elsif entity
+        search_by_entity
+      else
+        search_by_all_entities
+      end
+    end
+
+    private
+
+    attr_accessor :search_criteria, :customers, :users, :tasks, :projects, :resources, :limit, :entity, :current_user,
+                  :company
+
+    def search_all_tasks
+      @tasks = TaskRecord.all_accessed_by(current_user).where(task_num: search_criteria)
+    end
+
+    def search_by_entity
+      case entity
+      when /user/
+        @users = ::Searching::ByEntity::UsersService.new(current_user, search_criteria, limit).perform
+      when /customer/
+        @customers = ::Searching::ByEntity::CustomersService.new(current_user, search_criteria, limit).perform
+      when /task/
+        @tasks = ::Searching::ByEntity::TasksService.new(current_user, search_criteria, limit).perform
+      when /resource/
+        if current_user.use_resources?
+          @resources = ::Searching::ByEntity::ResourcesService.new(current_user, search_criteria,
+                                                                   limit).perform
+        end
+      when /project/
+        @projects = ::Searching::ByEntity::ProjectsService.new(current_user, search_criteria, limit).perform
+      end
+
+      result
+    end
+
+    def search_by_all_entities
+      ::Searching::ByAllEntitiesService.new(current_user, search_criteria, limit).perform
+    end
+
+    def result
+      { tasks: @tasks, users: @users, customers: @customers, resources: @resources, projects: @projects, limit: @limit }
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c29f976044..6f0373bd44 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,6 +13,9 @@
 
 ActiveRecord::Schema.define(version: 20160929081445) do
 
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
   create_table "access_levels", force: :cascade do |t|
     t.string   "name",       limit: 255
     t.datetime "created_at"
@@ -20,29 +23,29 @@
   end
 
   create_table "companies", force: :cascade do |t|
-    t.string   "name",                       limit: 200,   default: "",   null: false
+    t.string   "name",                       limit: 200, default: "",   null: false
     t.string   "contact_email",              limit: 200
     t.string   "contact_name",               limit: 200
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "subdomain",                  limit: 255,   default: "",   null: false
-    t.boolean  "show_wiki",                                default: true
-    t.text     "suppressed_email_addresses", limit: 65535
+    t.string   "subdomain",                  limit: 255, default: "",   null: false
+    t.boolean  "show_wiki",                              default: true
+    t.text     "suppressed_email_addresses"
     t.string   "logo_file_name",             limit: 255
     t.string   "logo_content_type",          limit: 255
-    t.integer  "logo_file_size",             limit: 4
+    t.integer  "logo_file_size"
     t.datetime "logo_updated_at"
-    t.boolean  "use_resources",                            default: true
-    t.boolean  "use_billing",                              default: true
-    t.boolean  "use_score_rules",                          default: true
+    t.boolean  "use_resources",                          default: true
+    t.boolean  "use_billing",                            default: true
+    t.boolean  "use_score_rules",                        default: true
   end
 
   add_index "companies", ["subdomain"], name: "index_companies_on_subdomain", unique: true, using: :btree
 
   create_table "custom_attribute_choices", force: :cascade do |t|
-    t.integer  "custom_attribute_id", limit: 4
+    t.integer  "custom_attribute_id"
     t.string   "value",               limit: 255
-    t.integer  "position",            limit: 4
+    t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "color",               limit: 255
@@ -51,27 +54,27 @@
   add_index "custom_attribute_choices", ["custom_attribute_id"], name: "index_custom_attribute_choices_on_custom_attribute_id", using: :btree
 
   create_table "custom_attribute_values", force: :cascade do |t|
-    t.integer  "custom_attribute_id", limit: 4
-    t.integer  "attributable_id",     limit: 4
+    t.integer  "custom_attribute_id"
+    t.integer  "attributable_id"
     t.string   "attributable_type",   limit: 255
-    t.text     "value",               limit: 65535
+    t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "choice_id",           limit: 4
+    t.integer  "choice_id"
   end
 
   add_index "custom_attribute_values", ["attributable_id", "attributable_type"], name: "by_attributables", using: :btree
   add_index "custom_attribute_values", ["custom_attribute_id"], name: "index_custom_attribute_values_on_custom_attribute_id", using: :btree
 
   create_table "custom_attributes", force: :cascade do |t|
-    t.integer  "company_id",          limit: 4
+    t.integer  "company_id"
     t.string   "attributable_type",   limit: 255
     t.string   "display_name",        limit: 255
     t.string   "ldap_attribute_type", limit: 255
     t.boolean  "mandatory"
     t.boolean  "multiple"
-    t.integer  "max_length",          limit: 4
-    t.integer  "position",            limit: 4
+    t.integer  "max_length"
+    t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -79,7 +82,7 @@
   add_index "custom_attributes", ["company_id", "attributable_type"], name: "index_custom_attributes_on_company_id_and_attributable_type", using: :btree
 
   create_table "customers", force: :cascade do |t|
-    t.integer  "company_id",   limit: 4,   default: 0,    null: false
+    t.integer  "company_id",               default: 0,    null: false
     t.string   "name",         limit: 200, default: "",   null: false
     t.string   "contact_name", limit: 200
     t.datetime "created_at"
@@ -90,17 +93,17 @@
   add_index "customers", ["company_id", "name"], name: "customers_company_id_index", using: :btree
 
   create_table "default_project_users", force: :cascade do |t|
-    t.integer  "project_id", limit: 4
-    t.integer  "user_id",    limit: 4
+    t.integer  "project_id"
+    t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",   limit: 4,     default: 0
-    t.integer  "attempts",   limit: 4,     default: 0
-    t.text     "handler",    limit: 65535
-    t.text     "last_error", limit: 65535
+    t.integer  "priority",               default: 0
+    t.integer  "attempts",               default: 0
+    t.text     "handler"
+    t.text     "last_error"
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
@@ -113,53 +116,53 @@
   add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
 
   create_table "dependencies", id: false, force: :cascade do |t|
-    t.integer "task_id",       limit: 4
-    t.integer "dependency_id", limit: 4
+    t.integer "task_id"
+    t.integer "dependency_id"
   end
 
   add_index "dependencies", ["dependency_id"], name: "dependencies_dependency_id_index", using: :btree
   add_index "dependencies", ["task_id"], name: "dependencies_task_id_index", using: :btree
 
   create_table "email_address_tasks", id: false, force: :cascade do |t|
-    t.integer  "task_id",          limit: 4
-    t.integer  "email_address_id", limit: 4
+    t.integer  "task_id"
+    t.integer  "email_address_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "email_addresses", force: :cascade do |t|
-    t.integer  "user_id",    limit: 4
+    t.integer  "user_id"
     t.string   "email",      limit: 255
     t.boolean  "default"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "company_id", limit: 4
+    t.integer  "company_id"
   end
 
   add_index "email_addresses", ["email"], name: "index_email_addresses_on_email", unique: true, using: :btree
   add_index "email_addresses", ["user_id"], name: "fk_email_addresses_user_id", using: :btree
 
   create_table "email_deliveries", force: :cascade do |t|
-    t.integer  "work_log_id", limit: 4
+    t.integer  "work_log_id"
     t.string   "status",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "email",       limit: 255
-    t.integer  "user_id",     limit: 4
+    t.integer  "user_id"
   end
 
   add_index "email_deliveries", ["status"], name: "index_email_deliveries_on_status", using: :btree
   add_index "email_deliveries", ["work_log_id"], name: "index_email_deliveries_on_work_log_id", using: :btree
 
   create_table "event_logs", force: :cascade do |t|
-    t.integer  "company_id",  limit: 4
-    t.integer  "project_id",  limit: 4
-    t.integer  "user_id",     limit: 4
-    t.integer  "event_type",  limit: 4
+    t.integer  "company_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.integer  "event_type"
     t.string   "target_type", limit: 255
-    t.integer  "target_id",   limit: 4
+    t.integer  "target_id"
     t.string   "title",       limit: 255
-    t.text     "body",        limit: 65535
+    t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "user",        limit: 255
@@ -170,10 +173,10 @@
   add_index "event_logs", ["user_id"], name: "fk_event_logs_user_id", using: :btree
 
   create_table "generated_reports", force: :cascade do |t|
-    t.integer  "company_id", limit: 4
-    t.integer  "user_id",    limit: 4
+    t.integer  "company_id"
+    t.integer  "user_id"
     t.string   "filename",   limit: 255
-    t.text 'report', limit: Proc.new { ActiveRecord::Base.connection.adapter_name == 'MySQL' ? (4.gigabytes - 1) : (1.gigabyte - 1) }.call
+    t.text     "report"
     t.datetime "created_at"
   end
 
@@ -181,17 +184,17 @@
   add_index "generated_reports", ["user_id"], name: "fk_generated_reports_user_id", using: :btree
 
   create_table "ical_entries", force: :cascade do |t|
-    t.integer "task_id",     limit: 4
-    t.integer "work_log_id", limit: 4
-    t.text    "body",        limit: 65535
+    t.integer "task_id"
+    t.integer "work_log_id"
+    t.text    "body"
   end
 
   add_index "ical_entries", ["task_id"], name: "index_ical_entries_on_task_id", using: :btree
   add_index "ical_entries", ["work_log_id"], name: "index_ical_entries_on_work_log_id", using: :btree
 
   create_table "keywords", force: :cascade do |t|
-    t.integer  "company_id",     limit: 4
-    t.integer  "task_filter_id", limit: 4
+    t.integer  "company_id"
+    t.integer  "task_filter_id"
     t.string   "word",           limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -203,30 +206,30 @@
   create_table "locales", force: :cascade do |t|
     t.string   "locale",     limit: 6
     t.string   "key",        limit: 255
-    t.text     "singular",   limit: 65535
-    t.text     "plural",     limit: 65535
-    t.integer  "user_id",    limit: 4
+    t.text     "singular"
+    t.text     "plural"
+    t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "same",                     default: false
+    t.boolean  "same",                   default: false
   end
 
   add_index "locales", ["locale", "key"], name: "index_locales_on_locale_and_key", unique: true, using: :btree
 
   create_table "milestones", force: :cascade do |t|
-    t.integer  "company_id",      limit: 4
-    t.integer  "project_id",      limit: 4
-    t.integer  "user_id",         limit: 4
+    t.integer  "company_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
     t.string   "name",            limit: 255
-    t.text     "description",     limit: 65535
+    t.text     "description"
     t.datetime "due_at"
-    t.integer  "position",        limit: 4
+    t.integer  "position"
     t.datetime "completed_at"
-    t.integer  "total_tasks",     limit: 4,     default: 0
-    t.integer  "completed_tasks", limit: 4,     default: 0
+    t.integer  "total_tasks",                 default: 0
+    t.integer  "completed_tasks",             default: 0
     t.datetime "updated_at"
     t.datetime "created_at"
-    t.integer  "status",          limit: 4
+    t.integer  "status"
     t.datetime "start_at"
   end
 
@@ -237,13 +240,13 @@
 
   create_table "news_items", force: :cascade do |t|
     t.datetime "created_at"
-    t.text     "body",       limit: 65535
-    t.boolean  "portal",                   default: true
-    t.integer  "company_id", limit: 4
+    t.text     "body"
+    t.boolean  "portal",     default: true
+    t.integer  "company_id"
   end
 
   create_table "organizational_units", force: :cascade do |t|
-    t.integer  "customer_id", limit: 4
+    t.integer  "customer_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name",        limit: 255
@@ -253,10 +256,10 @@
   add_index "organizational_units", ["customer_id"], name: "fk_organizational_units_customer_id", using: :btree
 
   create_table "preferences", force: :cascade do |t|
-    t.integer  "preferencable_id",   limit: 4
+    t.integer  "preferencable_id"
     t.string   "preferencable_type", limit: 255
     t.string   "key",                limit: 255
-    t.text     "value",              limit: 65535
+    t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -264,20 +267,20 @@
   add_index "preferences", ["preferencable_id", "preferencable_type"], name: "index_preferences_on_preferencable_id_and_preferencable_type", using: :btree
 
   create_table "project_files", force: :cascade do |t|
-    t.integer  "company_id",        limit: 4,   default: 0, null: false
-    t.integer  "project_id",        limit: 4,   default: 0, null: false
-    t.integer  "customer_id",       limit: 4,   default: 0, null: false
+    t.integer  "company_id",                    default: 0, null: false
+    t.integer  "project_id",                    default: 0, null: false
+    t.integer  "customer_id",                   default: 0, null: false
     t.datetime "created_at",                                null: false
     t.datetime "updated_at",                                null: false
-    t.integer  "thumbnail_id",      limit: 4
-    t.integer  "task_id",           limit: 4
-    t.integer  "user_id",           limit: 4
+    t.integer  "thumbnail_id"
+    t.integer  "task_id"
+    t.integer  "user_id"
     t.string   "file_file_name",    limit: 255
     t.string   "file_content_type", limit: 255
-    t.integer  "file_file_size",    limit: 4,               null: false
+    t.integer  "file_file_size",                            null: false
     t.datetime "file_updated_at"
     t.string   "uri",               limit: 255,             null: false
-    t.integer  "work_log_id",       limit: 4
+    t.integer  "work_log_id"
   end
 
   add_index "project_files", ["company_id"], name: "project_files_company_id_index", using: :btree
@@ -286,20 +289,20 @@
   add_index "project_files", ["user_id"], name: "fk_project_files_user_id", using: :btree
 
   create_table "project_permissions", force: :cascade do |t|
-    t.integer  "company_id",        limit: 4
-    t.integer  "project_id",        limit: 4
-    t.integer  "user_id",           limit: 4
-    t.datetime "created_at"
-    t.boolean  "can_comment",                 default: false
-    t.boolean  "can_work",                    default: false
-    t.boolean  "can_report",                  default: false
-    t.boolean  "can_create",                  default: false
-    t.boolean  "can_edit",                    default: false
-    t.boolean  "can_reassign",                default: false
-    t.boolean  "can_close",                   default: false
-    t.boolean  "can_grant",                   default: false
-    t.boolean  "can_milestone",               default: false
-    t.boolean  "can_see_unwatched",           default: true
+    t.integer  "company_id"
+    t.integer  "project_id"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.boolean  "can_comment",       default: false
+    t.boolean  "can_work",          default: false
+    t.boolean  "can_report",        default: false
+    t.boolean  "can_create",        default: false
+    t.boolean  "can_edit",          default: false
+    t.boolean  "can_reassign",      default: false
+    t.boolean  "can_close",         default: false
+    t.boolean  "can_grant",         default: false
+    t.boolean  "can_milestone",     default: false
+    t.boolean  "can_see_unwatched", default: true
   end
 
   add_index "project_permissions", ["company_id"], name: "fk_project_permissions_company_id", using: :btree
@@ -307,29 +310,29 @@
   add_index "project_permissions", ["user_id"], name: "project_permissions_user_id_index", using: :btree
 
   create_table "projects", force: :cascade do |t|
-    t.string   "name",             limit: 200,                           default: "",    null: false
-    t.integer  "company_id",       limit: 4,                             default: 0,     null: false
-    t.integer  "customer_id",      limit: 4,                             default: 0,     null: false
+    t.string   "name",             limit: 200,                         default: "",    null: false
+    t.integer  "company_id",                                           default: 0,     null: false
+    t.integer  "customer_id",                                          default: 0,     null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "completed_at"
-    t.integer  "critical_count",   limit: 4,                             default: 0
-    t.integer  "normal_count",     limit: 4,                             default: 0
-    t.integer  "low_count",        limit: 4,                             default: 0
-    t.text     "description",      limit: 65535
-    t.integer  "open_tasks",       limit: 4
-    t.integer  "total_tasks",      limit: 4
-    t.integer  "total_milestones", limit: 4
-    t.integer  "open_milestones",  limit: 4
-    t.decimal  "default_estimate",               precision: 5, scale: 2, default: 1.0
-    t.boolean  "suppressBilling",                                        default: false, null: false
+    t.integer  "critical_count",                                       default: 0
+    t.integer  "normal_count",                                         default: 0
+    t.integer  "low_count",                                            default: 0
+    t.text     "description"
+    t.integer  "open_tasks"
+    t.integer  "total_tasks"
+    t.integer  "total_milestones"
+    t.integer  "open_milestones"
+    t.decimal  "default_estimate",             precision: 5, scale: 2, default: 1.0
+    t.boolean  "suppressBilling",                                      default: false, null: false
   end
 
   add_index "projects", ["company_id"], name: "projects_company_id_index", using: :btree
   add_index "projects", ["customer_id"], name: "projects_customer_id_index", using: :btree
 
   create_table "properties", force: :cascade do |t|
-    t.integer  "company_id",    limit: 4
+    t.integer  "company_id"
     t.string   "name",          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -341,11 +344,11 @@
   add_index "properties", ["company_id"], name: "index_properties_on_company_id", using: :btree
 
   create_table "property_values", force: :cascade do |t|
-    t.integer  "property_id", limit: 4
+    t.integer  "property_id"
     t.string   "value",       limit: 255
     t.string   "color",       limit: 255
     t.boolean  "default"
-    t.integer  "position",    limit: 4,    null: false
+    t.integer  "position",                 null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "icon_url",    limit: 1000
@@ -354,8 +357,8 @@
   add_index "property_values", ["property_id"], name: "index_property_values_on_property_id", using: :btree
 
   create_table "resource_attributes", force: :cascade do |t|
-    t.integer  "resource_id",                limit: 4
-    t.integer  "resource_type_attribute_id", limit: 4
+    t.integer  "resource_id"
+    t.integer  "resource_type_attribute_id"
     t.string   "value",                      limit: 255
     t.string   "password",                   limit: 255
     t.datetime "created_at"
@@ -366,14 +369,14 @@
   add_index "resource_attributes", ["resource_type_attribute_id"], name: "fk_resource_attributes_resource_type_attribute_id", using: :btree
 
   create_table "resource_type_attributes", force: :cascade do |t|
-    t.integer  "resource_type_id",     limit: 4
+    t.integer  "resource_type_id"
     t.string   "name",                 limit: 255
     t.boolean  "is_mandatory"
     t.boolean  "allows_multiple"
     t.boolean  "is_password"
     t.string   "validation_regex",     limit: 255
-    t.integer  "default_field_length", limit: 4
-    t.integer  "position",             limit: 4
+    t.integer  "default_field_length"
+    t.integer  "position"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -381,7 +384,7 @@
   add_index "resource_type_attributes", ["resource_type_id"], name: "fk_resource_type_attributes_resource_type_id", using: :btree
 
   create_table "resource_types", force: :cascade do |t|
-    t.integer  "company_id", limit: 4
+    t.integer  "company_id"
     t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -390,37 +393,37 @@
   add_index "resource_types", ["company_id"], name: "fk_resource_types_company_id", using: :btree
 
   create_table "resources", force: :cascade do |t|
-    t.integer  "company_id",       limit: 4
-    t.integer  "resource_type_id", limit: 4
-    t.integer  "parent_id",        limit: 4
+    t.integer  "company_id"
+    t.integer  "resource_type_id"
+    t.integer  "parent_id"
     t.string   "name",             limit: 255
-    t.integer  "customer_id",      limit: 4
-    t.text     "notes",            limit: 65535
+    t.integer  "customer_id"
+    t.text     "notes"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "active",                         default: true
+    t.boolean  "active",                       default: true
   end
 
   add_index "resources", ["company_id"], name: "fk_resources_company_id", using: :btree
 
   create_table "resources_tasks", id: false, force: :cascade do |t|
-    t.integer "resource_id", limit: 4
-    t.integer "task_id",     limit: 4
+    t.integer "resource_id"
+    t.integer "task_id"
   end
 
   add_index "resources_tasks", ["resource_id"], name: "index_resources_tasks_on_resource_id", using: :btree
   add_index "resources_tasks", ["task_id"], name: "index_resources_tasks_on_task_id", using: :btree
 
   create_table "scm_changesets", force: :cascade do |t|
-    t.integer  "user_id",         limit: 4
-    t.integer  "scm_project_id",  limit: 4
+    t.integer  "user_id"
+    t.integer  "scm_project_id"
     t.string   "author",          limit: 255
-    t.integer  "changeset_num",   limit: 4
+    t.integer  "changeset_num"
     t.datetime "commit_date"
     t.string   "changeset_rev",   limit: 255
-    t.text     "message",         limit: 65535
-    t.integer  "scm_files_count", limit: 4
-    t.integer  "task_id",         limit: 4
+    t.text     "message"
+    t.integer  "scm_files_count"
+    t.integer  "task_id"
   end
 
   add_index "scm_changesets", ["author"], name: "scm_changesets_author_index", using: :btree
@@ -428,22 +431,22 @@
   add_index "scm_changesets", ["user_id"], name: "fk_scm_changesets_user_id", using: :btree
 
   create_table "scm_files", force: :cascade do |t|
-    t.text    "path",             limit: 65535
+    t.text    "path"
     t.string  "state",            limit: 255
-    t.integer "scm_changeset_id", limit: 4
+    t.integer "scm_changeset_id"
   end
 
   add_index "scm_files", ["scm_changeset_id"], name: "index_scm_files_on_scm_changeset_id", using: :btree
 
   create_table "scm_projects", force: :cascade do |t|
-    t.integer  "project_id",       limit: 4
-    t.integer  "company_id",       limit: 4
+    t.integer  "project_id"
+    t.integer  "company_id"
     t.string   "scm_type",         limit: 255
     t.datetime "last_commit_date"
     t.datetime "last_update"
     t.datetime "last_checkout"
-    t.text     "module",           limit: 65535
-    t.text     "location",         limit: 65535
+    t.text     "module"
+    t.text     "location"
     t.string   "secret_key",       limit: 255
   end
 
@@ -451,10 +454,10 @@
 
   create_table "score_rules", force: :cascade do |t|
     t.string   "name",               limit: 255
-    t.integer  "score",              limit: 4
-    t.integer  "score_type",         limit: 4
+    t.integer  "score"
+    t.integer  "score_type"
     t.decimal  "exponent",                       precision: 5, scale: 2, default: 1.0
-    t.integer  "controlled_by_id",   limit: 4
+    t.integer  "controlled_by_id"
     t.string   "controlled_by_type", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -464,25 +467,25 @@
   add_index "score_rules", ["score_type"], name: "index_score_rules_on_score_type", using: :btree
 
   create_table "service_level_agreements", force: :cascade do |t|
-    t.integer  "service_id",  limit: 4
-    t.integer  "customer_id", limit: 4
+    t.integer  "service_id"
+    t.integer  "customer_id"
     t.boolean  "billable"
-    t.integer  "company_id",  limit: 4
+    t.integer  "company_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "services", force: :cascade do |t|
     t.string   "name",        limit: 255
-    t.text     "description", limit: 65535
-    t.integer  "company_id",  limit: 4
+    t.text     "description"
+    t.integer  "company_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "sessions", force: :cascade do |t|
     t.string   "session_id", limit: 255
-    t.text     "data",       limit: 65535
+    t.text     "data"
     t.datetime "updated_at"
   end
 
@@ -490,13 +493,13 @@
   add_index "sessions", ["updated_at"], name: "sessions_updated_at", using: :btree
 
   create_table "sheets", force: :cascade do |t|
-    t.integer  "user_id",         limit: 4,     default: 0, null: false
-    t.integer  "task_id",         limit: 4,     default: 0, null: false
-    t.integer  "project_id",      limit: 4,     default: 0, null: false
+    t.integer  "user_id",         default: 0, null: false
+    t.integer  "task_id",         default: 0, null: false
+    t.integer  "project_id",      default: 0, null: false
     t.datetime "created_at"
-    t.text     "body",            limit: 65535
+    t.text     "body"
     t.datetime "paused_at"
-    t.integer  "paused_duration", limit: 4,     default: 0
+    t.integer  "paused_duration", default: 0
   end
 
   add_index "sheets", ["task_id"], name: "index_sheets_on_task_id", using: :btree
@@ -504,38 +507,38 @@
 
   create_table "snippets", force: :cascade do |t|
     t.string   "name",       limit: 255
-    t.text     "body",       limit: 65535
-    t.integer  "company_id", limit: 4
-    t.integer  "user_id",    limit: 4
+    t.text     "body"
+    t.integer  "company_id"
+    t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "position",   limit: 4
+    t.integer  "position"
   end
 
   create_table "stages_stage_models", force: :cascade do |t|
-    t.integer  "stage_id",       limit: 4
-    t.integer  "stage_model_id", limit: 4
-    t.datetime "created_at",               null: false
-    t.datetime "updated_at",               null: false
+    t.integer  "stage_id"
+    t.integer  "stage_model_id"
+    t.datetime "created_at",     null: false
+    t.datetime "updated_at",     null: false
   end
 
   create_table "statuses", force: :cascade do |t|
-    t.integer  "company_id", limit: 4
+    t.integer  "company_id"
     t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "tags", force: :cascade do |t|
-    t.integer "company_id", limit: 4
+    t.integer "company_id"
     t.string  "name",       limit: 255
   end
 
   add_index "tags", ["company_id", "name"], name: "index_tags_on_company_id_and_name", unique: true, using: :btree
 
   create_table "task_customers", force: :cascade do |t|
-    t.integer  "customer_id", limit: 4
-    t.integer  "task_id",     limit: 4
+    t.integer  "customer_id"
+    t.integer  "task_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -544,9 +547,9 @@
   add_index "task_customers", ["task_id"], name: "fk_task_customers_task_id", using: :btree
 
   create_table "task_filter_qualifiers", force: :cascade do |t|
-    t.integer  "task_filter_id",     limit: 4
+    t.integer  "task_filter_id"
     t.string   "qualifiable_type",   limit: 255
-    t.integer  "qualifiable_id",     limit: 4
+    t.integer  "qualifiable_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "qualifiable_column", limit: 255
@@ -556,8 +559,8 @@
   add_index "task_filter_qualifiers", ["task_filter_id"], name: "fk_task_filter_qualifiers_task_filter_id", using: :btree
 
   create_table "task_filter_users", force: :cascade do |t|
-    t.integer  "user_id",        limit: 4
-    t.integer  "task_filter_id", limit: 4
+    t.integer  "user_id"
+    t.integer  "task_filter_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -567,14 +570,14 @@
 
   create_table "task_filters", force: :cascade do |t|
     t.string   "name",               limit: 255
-    t.integer  "company_id",         limit: 4
-    t.integer  "user_id",            limit: 4
+    t.integer  "company_id"
+    t.integer  "user_id"
     t.boolean  "shared"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "system",                         default: false
     t.boolean  "unread_only",                    default: false
-    t.integer  "recent_for_user_id", limit: 4
+    t.integer  "recent_for_user_id"
     t.boolean  "unassigned"
   end
 
@@ -582,24 +585,24 @@
   add_index "task_filters", ["user_id"], name: "fk_task_filters_user_id", using: :btree
 
   create_table "task_property_values", force: :cascade do |t|
-    t.integer "task_id",           limit: 4
-    t.integer "property_id",       limit: 4
-    t.integer "property_value_id", limit: 4
+    t.integer "task_id"
+    t.integer "property_id"
+    t.integer "property_value_id"
   end
 
   add_index "task_property_values", ["task_id", "property_id"], name: "task_property", unique: true, using: :btree
 
   create_table "task_tags", id: false, force: :cascade do |t|
-    t.integer "tag_id",  limit: 4
-    t.integer "task_id", limit: 4
+    t.integer "tag_id"
+    t.integer "task_id"
   end
 
   add_index "task_tags", ["tag_id"], name: "task_tags_tag_id_index", using: :btree
   add_index "task_tags", ["task_id"], name: "task_tags_task_id_index", using: :btree
 
   create_table "task_users", force: :cascade do |t|
-    t.integer  "user_id",    limit: 4
-    t.integer  "task_id",    limit: 4
+    t.integer  "user_id"
+    t.integer  "task_id"
     t.string   "type",       limit: 255, default: "TaskOwner"
     t.boolean  "unread"
     t.datetime "created_at"
@@ -610,35 +613,35 @@
   add_index "task_users", ["unread", "user_id"], name: "index_task_users_on_unread_and_user_id", using: :btree
 
   create_table "tasks", force: :cascade do |t|
-    t.string   "name",                   limit: 200,   default: "",     null: false
-    t.integer  "project_id",             limit: 4,     default: 0,      null: false
-    t.integer  "position",               limit: 4,     default: 0,      null: false
-    t.datetime "created_at",                                            null: false
+    t.string   "name",                   limit: 200, default: "",     null: false
+    t.integer  "project_id",                         default: 0,      null: false
+    t.integer  "position",                           default: 0,      null: false
+    t.datetime "created_at",                                          null: false
     t.datetime "due_at"
-    t.datetime "updated_at",                                            null: false
+    t.datetime "updated_at",                                          null: false
     t.datetime "completed_at"
-    t.integer  "duration",               limit: 4,     default: 1
-    t.integer  "hidden",                 limit: 4,     default: 0
-    t.integer  "milestone_id",           limit: 4
-    t.text     "description",            limit: 65535
-    t.integer  "company_id",             limit: 4
-    t.integer  "priority",               limit: 4,     default: 0
-    t.integer  "updated_by_id",          limit: 4
-    t.integer  "severity_id",            limit: 4,     default: 0
-    t.integer  "type_id",                limit: 4,     default: 0
-    t.integer  "task_num",               limit: 4,     default: 0
-    t.integer  "status",                 limit: 4,     default: 0
-    t.integer  "creator_id",             limit: 4
+    t.integer  "duration",                           default: 1
+    t.integer  "hidden",                             default: 0
+    t.integer  "milestone_id"
+    t.text     "description"
+    t.integer  "company_id"
+    t.integer  "priority",                           default: 0
+    t.integer  "updated_by_id"
+    t.integer  "severity_id",                        default: 0
+    t.integer  "type_id",                            default: 0
+    t.integer  "task_num",                           default: 0
+    t.integer  "status",                             default: 0
+    t.integer  "creator_id"
     t.datetime "hide_until"
-    t.integer  "worked_minutes",         limit: 4,     default: 0
-    t.string   "type",                   limit: 255,   default: "Task"
-    t.integer  "weight",                 limit: 4,     default: 0
-    t.integer  "weight_adjustment",      limit: 4,     default: 0
-    t.boolean  "wait_for_customer",                    default: false
-    t.integer  "service_id",             limit: 4
-    t.boolean  "isQuoted",                             default: false,  null: false
+    t.integer  "worked_minutes",                     default: 0
+    t.string   "type",                   limit: 255, default: "Task"
+    t.integer  "weight",                             default: 0
+    t.integer  "weight_adjustment",                  default: 0
+    t.boolean  "wait_for_customer",                  default: false
+    t.integer  "service_id"
+    t.boolean  "isQuoted",                           default: false,  null: false
     t.datetime "estimate_date"
-    t.integer  "position_task_template", limit: 4
+    t.integer  "position_task_template"
   end
 
   add_index "tasks", ["company_id"], name: "tasks_company_id_index", using: :btree
@@ -650,87 +653,87 @@
 
   create_table "time_ranges", force: :cascade do |t|
     t.string   "name",       limit: 255
-    t.text     "start",      limit: 65535
-    t.text     "end",        limit: 65535
+    t.text     "start"
+    t.text     "end"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "todos", force: :cascade do |t|
-    t.integer  "task_id",              limit: 4
+    t.integer  "task_id"
     t.string   "name",                 limit: 255
-    t.integer  "position",             limit: 4
-    t.integer  "creator_id",           limit: 4
+    t.integer  "position"
+    t.integer  "creator_id"
     t.datetime "completed_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "completed_by_user_id", limit: 4
+    t.integer  "completed_by_user_id"
   end
 
   add_index "todos", ["task_id"], name: "index_todos_on_task_id", using: :btree
 
   create_table "trigger_actions", force: :cascade do |t|
-    t.integer  "trigger_id", limit: 4
+    t.integer  "trigger_id"
     t.string   "name",       limit: 255
     t.string   "type",       limit: 255
-    t.integer  "argument",   limit: 4
+    t.integer  "argument"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "triggers", force: :cascade do |t|
-    t.integer  "company_id",     limit: 4
-    t.integer  "task_filter_id", limit: 4
+    t.integer  "company_id"
+    t.integer  "task_filter_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "event_id",       limit: 4
+    t.integer  "event_id"
   end
 
   create_table "users", force: :cascade do |t|
     t.string   "name",                       limit: 200, default: "",         null: false
     t.string   "username",                   limit: 200, default: "",         null: false
-    t.integer  "company_id",                 limit: 4,   default: 0,          null: false
+    t.integer  "company_id",                             default: 0,          null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "admin",                      limit: 4,   default: 0
+    t.integer  "admin",                                  default: 0
     t.string   "time_zone",                  limit: 255
-    t.integer  "option_tracktime",           limit: 4
-    t.integer  "seen_news_id",               limit: 4,   default: 0
-    t.integer  "last_project_id",            limit: 4
+    t.integer  "option_tracktime"
+    t.integer  "seen_news_id",                           default: 0
+    t.integer  "last_project_id"
     t.datetime "last_seen_at"
     t.datetime "last_ping_at"
-    t.integer  "last_milestone_id",          limit: 4
-    t.integer  "last_filter",                limit: 4
+    t.integer  "last_milestone_id"
+    t.integer  "last_filter"
     t.string   "date_format",                limit: 255, default: "%d/%m/%Y", null: false
     t.string   "time_format",                limit: 255, default: "%H:%M",    null: false
     t.string   "uuid",                       limit: 255,                      null: false
-    t.integer  "seen_welcome",               limit: 4,   default: 0
+    t.integer  "seen_welcome",                           default: 0
     t.string   "locale",                     limit: 255, default: "en_US"
-    t.integer  "option_avatars",             limit: 4,   default: 1
+    t.integer  "option_avatars",                         default: 1
     t.string   "autologin",                  limit: 255,                      null: false
     t.datetime "remember_until"
     t.boolean  "option_floating_chat",                   default: true
     t.boolean  "create_projects",                        default: true
     t.boolean  "receive_own_notifications",              default: false
     t.boolean  "use_resources"
-    t.integer  "customer_id",                limit: 4
+    t.integer  "customer_id"
     t.boolean  "active",                                 default: true
     t.boolean  "read_clients",                           default: false
     t.boolean  "create_clients",                         default: false
     t.boolean  "edit_clients",                           default: false
     t.boolean  "can_approve_work_logs"
     t.boolean  "auto_add_to_customer_tasks"
-    t.integer  "access_level_id",            limit: 4,   default: 1
+    t.integer  "access_level_id",                        default: 1
     t.string   "avatar_file_name",           limit: 255
     t.string   "avatar_content_type",        limit: 255
-    t.integer  "avatar_file_size",           limit: 4
+    t.integer  "avatar_file_size"
     t.datetime "avatar_updated_at"
     t.string   "encrypted_password",         limit: 128, default: "",         null: false
     t.string   "password_salt",              limit: 255, default: "",         null: false
     t.string   "reset_password_token",       limit: 255
     t.string   "remember_token",             limit: 255
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",              limit: 4,   default: 0
+    t.integer  "sign_in_count",                          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip",         limit: 255
@@ -750,41 +753,41 @@
   add_index "users", ["uuid"], name: "users_uuid_index", using: :btree
 
   create_table "widgets", force: :cascade do |t|
-    t.integer  "company_id",  limit: 4
-    t.integer  "user_id",     limit: 4
+    t.integer  "company_id"
+    t.integer  "user_id"
     t.string   "name",        limit: 255
-    t.integer  "widget_type", limit: 4,     default: 0
-    t.integer  "number",      limit: 4,     default: 5
+    t.integer  "widget_type",             default: 0
+    t.integer  "number",                  default: 5
     t.boolean  "mine"
     t.string   "order_by",    limit: 255
     t.string   "group_by",    limit: 255
     t.string   "filter_by",   limit: 255
-    t.boolean  "collapsed",                 default: false
-    t.integer  "column",      limit: 4,     default: 0
-    t.integer  "position",    limit: 4,     default: 0
-    t.boolean  "configured",                default: false
+    t.boolean  "collapsed",               default: false
+    t.integer  "column",                  default: 0
+    t.integer  "position",                default: 0
+    t.boolean  "configured",              default: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "gadget_url",  limit: 65535
+    t.text     "gadget_url"
   end
 
   add_index "widgets", ["company_id"], name: "fk_widgets_company_id", using: :btree
   add_index "widgets", ["user_id"], name: "index_widgets_on_user_id", using: :btree
 
   create_table "wiki_pages", force: :cascade do |t|
-    t.integer  "company_id", limit: 4
-    t.integer  "project_id", limit: 4
+    t.integer  "company_id"
+    t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "name",       limit: 255
     t.datetime "locked_at"
-    t.integer  "locked_by",  limit: 4
+    t.integer  "locked_by"
   end
 
   add_index "wiki_pages", ["company_id"], name: "wiki_pages_company_id_index", using: :btree
 
   create_table "wiki_references", force: :cascade do |t|
-    t.integer  "wiki_page_id",    limit: 4
+    t.integer  "wiki_page_id"
     t.string   "referenced_name", limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -793,11 +796,11 @@
   add_index "wiki_references", ["wiki_page_id"], name: "index_wiki_references_on_wiki_page_id", using: :btree
 
   create_table "wiki_revisions", force: :cascade do |t|
-    t.integer  "wiki_page_id", limit: 4
+    t.integer  "wiki_page_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "body",         limit: 65535
-    t.integer  "user_id",      limit: 4
+    t.text     "body"
+    t.integer  "user_id"
     t.string   "change",       limit: 255
   end
 
@@ -805,18 +808,18 @@
   add_index "wiki_revisions", ["wiki_page_id"], name: "wiki_revisions_wiki_page_id_index", using: :btree
 
   create_table "work_logs", force: :cascade do |t|
-    t.integer  "user_id",          limit: 4,     default: 0
-    t.integer  "task_id",          limit: 4
-    t.integer  "project_id",       limit: 4,     default: 0, null: false
-    t.integer  "company_id",       limit: 4,     default: 0, null: false
-    t.integer  "customer_id",      limit: 4,     default: 0, null: false
-    t.datetime "started_at",                                 null: false
-    t.integer  "duration",         limit: 4,     default: 0, null: false
-    t.text     "body",             limit: 65535
+    t.integer  "user_id",          default: 0
+    t.integer  "task_id"
+    t.integer  "project_id",       default: 0, null: false
+    t.integer  "company_id",       default: 0, null: false
+    t.integer  "customer_id",      default: 0, null: false
+    t.datetime "started_at",                   null: false
+    t.integer  "duration",         default: 0, null: false
+    t.text     "body"
     t.datetime "exported"
-    t.integer  "status",           limit: 4,     default: 0
-    t.integer  "access_level_id",  limit: 4,     default: 1
-    t.integer  "email_address_id", limit: 4
+    t.integer  "status",           default: 0
+    t.integer  "access_level_id",  default: 1
+    t.integer  "email_address_id"
   end
 
   add_index "work_logs", ["company_id"], name: "work_logs_company_id_index", using: :btree
@@ -827,14 +830,14 @@
   add_index "work_logs", ["user_id", "task_id"], name: "work_logs_user_id_index", using: :btree
 
   create_table "work_plans", force: :cascade do |t|
-    t.decimal  "monday",               precision: 1, default: 8
-    t.decimal  "tuesday",              precision: 1, default: 8
-    t.decimal  "wednesday",            precision: 1, default: 8
-    t.decimal  "thursday",             precision: 1, default: 8
-    t.decimal  "friday",               precision: 1, default: 8
-    t.decimal  "saturday",             precision: 1, default: 0
-    t.decimal  "sunday",               precision: 1, default: 0
-    t.integer  "user_id",    limit: 4
+    t.decimal  "monday",     precision: 1, default: 8
+    t.decimal  "tuesday",    precision: 1, default: 8
+    t.decimal  "wednesday",  precision: 1, default: 8
+    t.decimal  "thursday",   precision: 1, default: 8
+    t.decimal  "friday",     precision: 1, default: 8
+    t.decimal  "saturday",   precision: 1, default: 0
+    t.decimal  "sunday",     precision: 1, default: 0
+    t.integer  "user_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
diff --git a/spec/services/searching/customer_service_spec.rb b/spec/services/searching/customer_service_spec.rb
new file mode 100644
index 0000000000..42fd9f7c90
--- /dev/null
+++ b/spec/services/searching/customer_service_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Searching::CustomerService do
+  describe 'It search customers' do
+    before :each do
+      Setting.contact_creation_allowed = true
+      sign_in_normal_user
+
+      @customer_one = Customer.make(:name => 'Juan', :company => @logged_user.company)
+      @customer_two = Customer.make(:name => 'Omar', :company => @logged_user.company)
+    end
+
+    it 'should search and return result' do
+    end
+  end
+end