diff --git a/resources/install/scripts/intercept.lua b/resources/install/scripts/intercept.lua
index ca9af9d38b..326d93b985 100644
--- a/resources/install/scripts/intercept.lua
+++ b/resources/install/scripts/intercept.lua
@@ -254,9 +254,9 @@
 			-- next check should prevent pickup call from extension
 			-- e.g. if extension 100 dial some cell phone and some one else dial *8
 			-- he can pickup this call.
-			-- if not extension then
-			-- 	sql = sql .. "AND direction = 'outbound' ";
-			-- end
+			if not extension then
+				sql = sql .. "AND direction = 'outbound' ";
+			end
 			sql = sql .. "AND (1<>1 ";
 			for key,extension in pairs(extensions) do
 				sql = sql .. "OR presence_id = '"..extension.."@"..domain_name.."' ";
diff --git a/resources/install/scripts/ivr_menu.lua b/resources/install/scripts/ivr_menu.lua
index 554bcdc2f7..47b35679ed 100644
--- a/resources/install/scripts/ivr_menu.lua
+++ b/resources/install/scripts/ivr_menu.lua
@@ -407,8 +407,12 @@
 						if (row.ivr_menu_option_action == "menu-exec-app") then
 							--get the action and data
 								pos = string.find(row.ivr_menu_option_param, " ", 0, true);
-								action = string.sub(row.ivr_menu_option_param, 0, pos-1);
-								data = string.sub(row.ivr_menu_option_param, pos+1);
+								if pos then
+									action = string.sub(row.ivr_menu_option_param, 0, pos-1);
+									data = string.sub(row.ivr_menu_option_param, pos+1);
+								else
+									action, data = row.ivr_menu_option_param, ""
+								end
 
 							--check if the option uses a regex
 								regex = string.find(row.ivr_menu_option_digits, "(", 0, true);
@@ -431,7 +435,11 @@
 						end
 						if (action == "lua") then
 							pos = string.find(data, " ", 0, true);
-							script = string.sub(data, 0, pos-1);
+							if pos then
+								script = string.sub(data, 0, pos-1);
+							else
+								script = data
+							end
 						end
 					end --if regex match
 
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 3b5579bcb9..e5cf267146 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -251,7 +251,7 @@ form {
 	margin: 0;
 	}
 
-input.btn, input.button {
+input.btn, input.button, button {
 	font-family: Candara, Calibri, Segoe, "Segoe UI", Optima, Arial, sans-serif;
 	padding: 2px 6px 3px 6px;
 	color: #fff;
@@ -273,7 +273,7 @@ input.btn, input.button {
 	-moz-opacity: 0.9;
 	}
 
-input.btn:hover, input.button:hover, img.list_control_icon:hover {
+input.btn:hover, input.button:hover, img.list_control_icon:hover, button:hover {
 	box-shadow: 0 0 5px #cddaf0;
 	-webkit-box-shadow: 0 0 5px #cddaf0;
 	-moz-box-shadow: 0 0 5px #cddaf0;