diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index 04d21b68..e2fe15a6 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -39,16 +39,18 @@ class InstallController < BaseController
 	end
 
 	def lookup_domain
-    if (ENV["SERVER_MODE"] == "application") ||
-      (request.subdomain.present? && request.subdomain != "www" && ENV["SERVER_MODE"] != "cloud")
+    if ENV["SERVER_MODE"] == "application"
       if check_license(request.host)
-        redirect_to root_url
-      else
-        not_found unless check_subdomain(request.host)
+        redirect_to root_url and return
+      end
+    elsif request.subdomains.last && request.subdomains.last != "www"
+      if check_license(request.host)
+        redirect_to root_url and return
+      elsif check_subdomain(request.host)
+        return
       end
-    else
-      not_found
     end
+    not_found
   end
 
  #  def current_license(url, key)
diff --git a/app/models/license.rb b/app/models/license.rb
index f22357d2..26a5ea99 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -199,7 +199,7 @@ class License
     aes = MyAesCrypt.new
     aes_key, aes_iv = aes.export_key(lookup)
 
-    params = { query: { lookup_type: self.server_mode, lookup: lookup, iv_key: aes_iv} }
+    params = { query: { lookup_type: "cloud", lookup: lookup, iv_key: aes_iv} }
     response = self.class.get("/subdomain", params)
     response.parsed_response["status"]
   end
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 7ab4c8fd..40fe7287 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -14,23 +14,19 @@ class ActionController::Base
   def lookup_domain
     if ENV["SERVER_MODE"] == "cloud" && request.subdomains.last && request.subdomains.last != "www"
       @license = cache_license(ENV["SX_PROVISION_URL"], request.host) # request.subdomain.downcase
-      if (!@license.nil?)
+      if !@license.nil?
         logger.info "Location - " + @license.dbschema
         ActiveRecord::Base.establish_connection(website_connection(@license))
-        # authenticate_session_token
-        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
       else
         # reconnect_default_db
         logger.info 'License is nil'
         not_found
-        # redirect_to root_url(:host => request.domain) + "store_error"
-        # render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    elsif ENV["SERVER_MODE"] == "application" || (request.subdomains.last && request.subdomains.last != "www")
+    elsif ENV["SERVER_MODE"] == "application" || request.subdomains.last && request.subdomains.last != "www"
       # check for license file
       if check_license(request.host)
         current_license(ENV["SX_PROVISION_URL"], request.host)
-      elsif check_subdomain(request.host)
+      elsif ENV["SERVER_MODE"] == "application" || check_subdomain(request.host)
         redirect_to activate_path
       else
         not_found
@@ -122,14 +118,10 @@ class ActionController::API
       if (!@license.nil?)
         logger.info "Location - " + @license.dbschema
         ActiveRecord::Base.establish_connection(website_connection(@license))
-        # authenticate_session_token
-        # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
       else
         # reconnect_default_db
         logger.info 'License is nil'
         not_found
-        # redirect_to root_url(:host => request.domain) + "store_error"
-        # render :json => [{ status: false, message: 'Invalid Access!'}]
       end
     elsif ENV["SERVER_MODE"] == "application" || (request.subdomains.last && request.subdomains.last != "www")
       not_found unless check_license(request.host)