diff --git a/app/number_translations/cmd.php b/app/number_translations/cmd.php
index 2e4c81a231..3f730e4195 100644
--- a/app/number_translations/cmd.php
+++ b/app/number_translations/cmd.php
@@ -39,8 +39,8 @@
 	}
 
 //set the variables
-	$cmd = check_str($_GET['cmd']);
-	$rdr = check_str($_GET['rdr']);
+	$cmd = $_GET['cmd'];
+	$rdr = $_GET['rdr'];
 
 //create the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
diff --git a/app/number_translations/number_translation_delete.php b/app/number_translations/number_translation_delete.php
index 579f1b159e..1e870fcfc4 100644
--- a/app/number_translations/number_translation_delete.php
+++ b/app/number_translations/number_translation_delete.php
@@ -30,53 +30,65 @@
 	$language = new text;
 	$text = $language->get();
 
-//delete the message
-	message::add($text['message-delete']);
+	//delete the data
+	if (is_array($_REQUEST['number_translations']) && @sizeof($_REQUEST['number_translations']) != 0 && permission_exists('number_translation_delete')) {
+		//get the ids, build array
+			foreach ($_REQUEST['number_translations'] as $index => $number_translation_uuid) {
+				if (is_uuid($number_translation_uuid)) {
+					//delete the child data
+						$array['number_translation_details'][$index]['number_translation_uuid'] = $number_translation_uuid;
+					//delete number_translation
+						$array['number_translations'][$index]['number_translation_uuid'] = $number_translation_uuid;
+				}
+			}
 
-//delete the data
-	if (isset($_GET["id"]) && is_uuid($_GET["id"]) && permission_exists('number_translation_delete')) {
+		if (is_array($array) && @sizeof($array) != 0) {
+			//execute
+				$database = new database;
+				$database->app_name = 'number_translations';
+				$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
+				$database->delete($array);
+				unset($array);
 
-		//get the id
-			$id = check_str($_GET["id"]);
-
-		//delete the child data
-			$sql = "delete from v_number_translation_details ";
-			$sql .= "where number_translation_uuid = '".$id."' ";
-			$prep_statement = $db->prepare($sql);
-			$prep_statement->execute();
-
-		//delete number_translation
-			$sql = "delete from v_number_translations ";
-			$sql .= "where number_translation_uuid = '$id' ";
-			$prep_statement = $db->prepare(check_sql($sql));
-			$prep_statement->execute();
-			unset($sql);
+			//delete the message
+				message::add($text['message-delete']);
+		}
 
 		//redirect the user
 			header('Location: number_translations.php');
+			exit;
 	}
 
 //delete the child data
-	if (isset($_REQUEST["number_translation_detail_uuid"]) && is_uuid($_REQUEST["number_translation_detail_uuid"]) && permission_exists('number_translation_detail_delete')) {
+	if (is_uuid($_REQUEST["number_translation_detail_uuid"]) && permission_exists('number_translation_detail_delete')) {
 		//select from v_number_translation_details
-			$sql = "select * from v_number_translation_details ";
-			$sql .= "where number_translation_detail_uuid = '".$_REQUEST["number_translation_detail_uuid"]."' ";
-			$prep_statement = $db->prepare($sql);
-			$prep_statement->execute();
-			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-			foreach ($result as &$row) {
-				$number_translation_uuid = $row["number_translation_uuid"];
-			}
-			unset ($prep_statement, $result);
+			$sql = "select number_translation_uuid from v_number_translation_details ";
+			$sql .= "where number_translation_detail_uuid = :number_translation_detail_uuid ";
+			$parameters['number_translation_detail_uuid'] = $_REQUEST["number_translation_detail_uuid"];
+			$database = new database;
+			$number_translation_uuid = $database->select($sql, $parameters, 'column');
+			unset($sql, $parameters);
 
 		//delete the row
-			$sql = "delete from v_number_translation_details ";
-			$sql .= "where number_translation_detail_uuid = '".$_REQUEST["number_translation_detail_uuid"]."' ";
-			$prep_statement = $db->prepare($sql);
-			$prep_statement->execute();
+			$array['number_translation_details'][0]['number_translation_detail_uuid'] = $_REQUEST["number_translation_detail_uuid"];
+
+		//execute
+			$database = new database;
+			$database->app_name = 'number_translations';
+			$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
+			$database->delete($array);
+			unset($array);
+
+		//delete the message
+			message::add($text['message-delete']);
 
 		//redirect the user
 			header('Location: number_translation_edit.php?id='.$number_translation_uuid);
+			exit;
 	}
 
+//default redirect
+	header('Location: number_translations.php');
+	exit;
+
 ?>
diff --git a/app/number_translations/number_translation_edit.php b/app/number_translations/number_translation_edit.php
index 6137d430eb..8c9654f793 100644
--- a/app/number_translations/number_translation_edit.php
+++ b/app/number_translations/number_translation_edit.php
@@ -40,9 +40,9 @@
 	$text = $language->get();
 
 //action add or update
-	if (isset($_REQUEST["id"])) {
+	if (is_uuid($_REQUEST["id"])) {
 		$action = "update";
-		$number_translation_uuid = check_str($_REQUEST["id"]);
+		$number_translation_uuid = $_REQUEST["id"];
 	}
 	else {
 		$action = "add";
@@ -50,11 +50,11 @@
 
 //get http post variables and set them to php variables
 	if (is_array($_POST)) {
-		$number_translation_uuid = check_str($_POST["number_translation_uuid"]);
-		$number_translation_name = check_str($_POST["number_translation_name"]);
-		$number_translation_details = check_str($_POST["number_translation_details"]);
-		$number_translation_enabled = check_str($_POST["number_translation_enabled"]);
-		$number_translation_description = check_str($_POST["number_translation_description"]);
+		$number_translation_uuid = $_POST["number_translation_uuid"];
+		$number_translation_name = $_POST["number_translation_name"];
+		$number_translation_details = $_POST["number_translation_details"];
+		$number_translation_enabled = $_POST["number_translation_enabled"];
+		$number_translation_description = $_POST["number_translation_description"];
 	}
 
 //process the user data and save it to the database
@@ -62,7 +62,7 @@
 
 		//get the uuid from the POST
 			if ($action == "update") {
-				$number_translation_uuid = check_str($_POST["number_translation_uuid"]);
+				$number_translation_uuid = $_POST["number_translation_uuid"];
 			}
 
 		//check for all required data
@@ -102,7 +102,7 @@
 			}
 
 		//add the number_translation_uuid
-			if (strlen($_POST["number_translation_uuid"]) == 0) {
+			if (!is_uuid($_POST["number_translation_uuid"])) {
 				$number_translation_uuid = uuid();
 				$_POST["number_translation_uuid"] = $number_translation_uuid;
 			}
@@ -113,19 +113,13 @@
 		//save to the data
 			$database = new database;
 			$database->app_name = 'number_translations';
-			$database->app_uuid = null;
-			if (strlen($number_translation_uuid) > 0) {
+			$database->app_uuid = '6ad54de6-4909-11e7-a919-92ebcb67fe33';
+			if (is_uuid($number_translation_uuid)) {
 				$database->uuid($number_translation_uuid);
 			}
 			$database->save($array);
 			$message = $database->message;
 
-		//debug info
-			//echo "<pre>";
-			//print_r($message);
-			//echo "</pre>";
-			//exit;
-
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
@@ -137,43 +131,44 @@
 				header('Location: number_translation_edit.php?id='.escape($number_translation_uuid));
 				return;
 			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
+	}
 
 //pre-populate the form
 	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
-		$number_translation_uuid = check_str($_GET["id"]);
+		$number_translation_uuid = $_GET["id"];
 		$sql = "select * from v_number_translations ";
-		$sql .= "where number_translation_uuid = '$number_translation_uuid' ";
-		$prep_statement = $db->prepare(check_sql($sql));
-		$prep_statement->execute();
-		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		foreach ($result as &$row) {
+		$sql .= "where number_translation_uuid = :number_translation_uuid ";
+		$parameters['number_translation_uuid'] = $number_translation_uuid;
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && @sizeof($row) != 0) {
 			$number_translation_name = $row["number_translation_name"];
 			$number_translation_details = $row["number_translation_details"];
 			$number_translation_enabled = $row["number_translation_enabled"];
 			$number_translation_description = $row["number_translation_description"];
 		}
-		unset ($prep_statement);
+		unset($sql, $parameters, $row);
 	}
 
 //get the child data
-	if (strlen($number_translation_uuid) > 0) {
+	if (is_uuid($number_translation_uuid)) {
 		$sql = "select * from v_number_translation_details ";
-		$sql .= "where number_translation_uuid = '".$number_translation_uuid."' ";
-		$prep_statement = $db->prepare($sql);
-		$prep_statement->execute();
-		$number_translation_details = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+		$sql .= "where number_translation_uuid = :number_translation_uuid ";
+		$parameters['number_translation_uuid'] = $number_translation_uuid;
+		$database = new database;
+		$number_translation_details = $database->select($sql, $parameters, 'all');
 	}
 
 //add the $number_translation_uuid
-	if (strlen($number_translation_uuid) == 0) {
+	if (!is_uuid($number_translation_uuid)) {
 		$number_translation_uuid = uuid();
 	}
 
 //add an empty row
 	if (is_array($number_translation_details)) {
 		$x = count($number_translation_details);
-	} else {
+	}
+	else {
 		$number_translation_details = [];
 		$x = 0;
 	}
@@ -233,10 +228,12 @@
 		echo "					<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_replace]' maxlength='255' value=\"".escape($row["number_translation_detail_replace"])."\">\n";
 		echo "				</td>\n";
 		echo "				<td>\n";
-			echo "				<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_order]' maxlength='255' value=\"".escape($row["number_translation_detail_order"])."\">\n";
+		echo "					<input class='formfld' type='text' name='number_translation_details[$x][number_translation_detail_order]' maxlength='255' value=\"".escape($row["number_translation_detail_order"])."\">\n";
 		echo "				</td>\n";
 		echo "				<td class='list_control_icons' style='width: 25px;'>\n";
-		echo "					<a href=\"number_translation_delete.php?number_translation_detail_uuid=".escape($row["number_translation_detail_uuid"])."&amp;a=delete\" alt='delete' onclick=\"return confirm('Do you really want to delete this?')\"><button type='button' class='btn btn-default list_control_icon'><span class='glyphicon glyphicon-remove'></span></button></a>\n";
+		if ($x+1 != @sizeof($number_translation_details)) {
+			echo "				<a href=\"number_translation_delete.php?number_translation_detail_uuid=".escape($row["number_translation_detail_uuid"])."\" alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+		}
 		echo "				</td>\n";
 		echo "			</tr>\n";
 		$x++;
@@ -253,7 +250,6 @@
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
 	echo "	<select class='formfld' name='number_translation_enabled'>\n";
-	echo "		<option value=''></option>\n";
 	if ($number_translation_enabled == "true") {
 		echo "		<option value='true' selected='selected'>".$text['label-true']."</option>\n";
 	}
diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php
index 2b36eaf30b..e9f1aa39d1 100644
--- a/app/number_translations/number_translations.php
+++ b/app/number_translations/number_translations.php
@@ -58,17 +58,18 @@
 	}
 
 //get variables used to control the order
-	$order_by = check_str($_GET["order_by"]);
-	$order = check_str($_GET["order"]);
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
 
 //add the search term
-	$search = strtolower(check_str($_GET["search"]));
+	$search = strtolower($_GET["search"]);
 	if (strlen($search) > 0) {
 		$sql_search = " (";
-		$sql_search .= "   lower(number_translation_name) like '%".$search."%' ";
-		$sql_search .= "   or lower(number_translation_enabled) like '%".$search."%' ";
-		$sql_search .= "   or lower(number_translation_description) like '%".$search."%' ";
+		$sql_search .= "   lower(number_translation_name) like :search ";
+		$sql_search .= "   or lower(number_translation_enabled) like :search ";
+		$sql_search .= "   or lower(number_translation_description) like :search ";
 		$sql_search .= " ) ";
+		$parameters['search'] = '%'.$search.'%';
 	}
 
 //additional includes
@@ -76,22 +77,12 @@
 	require_once "resources/paging.php";
 
 //prepare to page the results
-	$sql = "select count(number_translation_uuid) as num_rows from v_number_translations ";
+	$sql = "select count(*) from v_number_translations ";
 	if (isset($sql_search)) {
 		$sql .= "where ".$sql_search;
 	}
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$prep_statement = $db->prepare($sql);
-	if ($prep_statement) {
-		$prep_statement->execute();
-		$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-		if ($row['num_rows'] > 0) {
-			$num_rows = $row['num_rows'];
-		}
-		else {
-			$num_rows = '0';
-		}
-	}
+	$database = new database;
+	$num_rows = $database->select($sql, (is_array($parameters) ? $parameters : null), 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
@@ -102,16 +93,12 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = "select * from v_number_translations ";
-	if (isset($sql_search)) {
-		$sql .= "where ".$sql_search;
-	}
-	if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
-	$sql .= "limit $rows_per_page offset $offset ";
-	$prep_statement = $db->prepare(check_sql($sql));
-	$prep_statement->execute();
-	$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-	unset ($prep_statement, $sql);
+	$sql = str_replace('count(*)', '*', $sql);
+	$sql .= order_by($order_by, $order);
+	$sql .= limit_offset($rows_per_page, $offset);
+	$database = new database;
+	$result = $database->select($sql, (is_array($parameters) ? $parameters : null), 'all');
+	unset($sql, $parameters);
 
 //alternate the row style
 	$c = 0;
@@ -139,12 +126,15 @@
 	echo "<table width='100%' border='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['title-number_translations']."</b></td>\n";
-	echo "		<form method='get' action=''>\n";
-	echo "			<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
+	echo "		<td width='50%' style='vertical-align: top; text-align: right; white-space: nowrap;'>\n";
+	echo "			<form method='get' action=''>\n";
+	if (permission_exists('number_translation_delete')) {
+		echo "			<input type='button' class='btn' value='".$text['button-delete']."' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm').action = 'number_translation_delete.php'; document.getElementById('frm').submit(); }\">\n";
+	}
 	echo "				<input type='text' class='txt' style='width: 150px' name='search' id='search' value='".escape($search)."'>\n";
 	echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>\n";
-	echo "			</td>\n";
-	echo "		</form>\n";
+	echo "			</form>\n";
+	echo "		</td>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' colspan='2'>\n";
@@ -153,7 +143,7 @@
 	echo "	</tr>\n";
 	echo "</table>\n";
 
-	echo "<form method='post' action=''>\n";
+	echo "<form method='post' id='frm' action='number_translation_delete.php'>\n";
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "	<th style='width:30px;'>\n";
@@ -172,7 +162,7 @@
 	echo "	</td>\n";
 	echo "<tr>\n";
 
-	if (is_array($result)) {
+	if (is_array($result) && @sizeof($result) != 0) {
 		$x = 0;
 		foreach($result as $row) {
 			if (permission_exists('number_translation_edit')) {
@@ -180,8 +170,7 @@
 			}
 			echo "<tr ".$tr_link.">\n";
 			echo "	<td valign='top' class='".$row_style[$c]." tr_link_void' style='align: center; padding: 3px 3px 0px 8px;'>\n";
-			echo "		<input type='checkbox' name=\"number_translations[$x][checked]\" id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('chk_all_".$x."').checked = false; }\">\n";
-			echo "		<input type='hidden' name=\"number_translations[$x][number_translation_uuid]\" value='".escape($row['number_translation_uuid'])."' />\n";
+			echo "		<input type='checkbox' name='number_translations[]' id='checkbox_".$x."' value='".escape($row['number_translation_uuid'])."' onclick=\"if (!this.checked) { document.getElementById('chk_all_".$x."').checked = false; }\">\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['number_translation_name'])."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['number_translation_enabled'])."&nbsp;</td>\n";
@@ -191,15 +180,15 @@
 				echo "<a href='number_translation_edit.php?id=".escape($row['number_translation_uuid'])."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 			}
 			if (permission_exists('number_translation_delete')) {
-				echo "<button type='submit' class='btn btn-default list_control_icon' name=\"number_translations[$x][action]\" alt='".$text['button-delete']."' value='delete'><span class='glyphicon glyphicon-remove'></span></button>";
+				echo "<a href='number_translation_delete.php?number_translations[]=".escape($row['number_translation_uuid'])."' alt='".$text['button-delete']."' onclick=\"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm').submit(); } else { return false; }\">$v_link_label_delete</a>";
 			}
 			echo "	</td>\n";
 			echo "</tr>\n";
 			$x++;
 			if ($c==0) { $c=1; } else { $c=0; }
-		} //end foreach
-		unset($sql, $result, $row_count);
-	} //end if results
+		}
+	}
+	unset($result, $row);
 
 	echo "<tr>\n";
 	echo "<td colspan='5' align='left'>\n";
@@ -226,4 +215,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file