diff --git a/.gitignore b/.gitignore
index eb71606..32791f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 # +-------------------------------------------------------------------------+
 
 locales/po/*.mo
+.omc/
diff --git a/Net/DNS2/Cache.php b/Net/DNS2/Cache.php
index dadf1cf..19ee6b1 100644
--- a/Net/DNS2/Cache.php
+++ b/Net/DNS2/Cache.php
@@ -67,7 +67,7 @@ public function get($key) {
 			if ($this->cache_serializer == 'json') {
 				return json_decode($this->cache_data[$key]['object']);
 			} else {
-				return unserialize($this->cache_data[$key]['object']);
+				return unserialize($this->cache_data[$key]['object'], ['allowed_classes' => false]);
 			}
 		} else {
 			return false;
diff --git a/Net/DNS2/Cache/File.php b/Net/DNS2/Cache/File.php
index 5122451..20f8b33 100644
--- a/Net/DNS2/Cache/File.php
+++ b/Net/DNS2/Cache/File.php
@@ -67,7 +67,7 @@ public function open($cache_file, $size, $serializer) {
 				if ($this->cache_serializer == 'json') {
 					$decoded = json_decode($data, true);
 				} else {
-					$decoded = unserialize($data);
+					$decoded = unserialize($data, ['allowed_classes' => false]);
 				}
 
 				if (is_array($decoded) == true) {
@@ -145,7 +145,7 @@ public function __destruct() {
 				if ($this->cache_serializer == 'json') {
 					$decoded = json_decode($data, true);
 				} else {
-					$decoded = unserialize($data);
+					$decoded = unserialize($data, ['allowed_classes' => false]);
 				}
 
 				if (is_array($decoded) == true) {
diff --git a/Net/DNS2/Cache/Shm.php b/Net/DNS2/Cache/Shm.php
index 690719c..d1571ae 100644
--- a/Net/DNS2/Cache/Shm.php
+++ b/Net/DNS2/Cache/Shm.php
@@ -104,7 +104,7 @@ public function open($cache_file, $size, $serializer) {
 					if ($this->cache_serializer == 'json') {
 						$decoded = json_decode($data, true);
 					} else {
-						$decoded = unserialize($data);
+						$decoded = unserialize($data, ['allowed_classes' => false]);
 					}
 
 					if (is_array($decoded) == true) {
@@ -195,7 +195,7 @@ public function __destruct() {
 				if ($this->cache_serializer == 'json') {
 					$decoded = json_decode($data, true);
 				} else {
-					$decoded = unserialize($data);
+					$decoded = unserialize($data, ['allowed_classes' => false]);
 				}
 
 				if (is_array($decoded) == true) {
diff --git a/lib/mactrack_functions.php b/lib/mactrack_functions.php
index d9db56d..a70dfca 100644
--- a/lib/mactrack_functions.php
+++ b/lib/mactrack_functions.php
@@ -3713,16 +3713,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 
diff --git a/mactrack_device_types.php b/mactrack_device_types.php
index e1564da..2b8f916 100644
--- a/mactrack_device_types.php
+++ b/mactrack_device_types.php
@@ -1180,24 +1180,24 @@ function scanDeviceType() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 
-				$('#import').click(function() {
+				$('#import').on('click', function() {
 					importRows();
 				});
 
-				$('#scan').click(function() {
+				$('#scan').on('click', function() {
 					scanDeviceType();
 				});
 			});
diff --git a/mactrack_devices.php b/mactrack_devices.php
index abf3881..5c895ad 100644
--- a/mactrack_devices.php
+++ b/mactrack_devices.php
@@ -1315,20 +1315,20 @@ function importRows() {
 		}
 
 		$(function() {
-			$('#mactrack').submit(function(event) {
+			$('#mactrack').on('submit', function(event) {
 				event.preventDefault();
 				applyFilter();
 			});
 
-			$('#clear').click(function() {
+			$('#clear').on('click', function() {
 				clearFilter();
 			});
 
-			$('#export').click(function() {
+			$('#export').on('click', function() {
 				exportRows();
 			});
 
-			$('#import').click(function() {
+			$('#import').on('click', function() {
 				importRows();
 			});
 		});
diff --git a/mactrack_macauth.php b/mactrack_macauth.php
index e36a66a..f3d774d 100644
--- a/mactrack_macauth.php
+++ b/mactrack_macauth.php
@@ -407,7 +407,7 @@ function mactrack_maca_filter() {
 					</td>
 				</tr>
 			</table>
-			<input type='hidden' id='page' value='<?php print get_request_var('page'); ?>'>
+			<input type='hidden' id='page' value='<?php print html_escape_request_var('page'); ?>'>
 			</form>
 			<script type='text/javascript'>
 
@@ -424,12 +424,12 @@ function clearFilter() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 			});
diff --git a/mactrack_macwatch.php b/mactrack_macwatch.php
index f7b3db0..9f95ec0 100644
--- a/mactrack_macwatch.php
+++ b/mactrack_macwatch.php
@@ -415,7 +415,7 @@ function mactrack_macw_filter() {
 					</td>
 				</tr>
 			</table>
-			<input type='hidden' id='page' value='<?php print get_request_var('page'); ?>'>
+			<input type='hidden' id='page' value='<?php print html_escape_request_var('page'); ?>'>
 			</form>
 			<script type='text/javascript'>
 
@@ -432,12 +432,12 @@ function clearFilter() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 			});
diff --git a/mactrack_snmp.php b/mactrack_snmp.php
index 7eab5dc..9008844 100644
--- a/mactrack_snmp.php
+++ b/mactrack_snmp.php
@@ -373,7 +373,7 @@ function mactrack_snmp_item_edit() {
 	<script type='text/javascript'>
 	$(function() {
 		setSNMP();
-		$('#snmp_version').change(function() {
+		$('#snmp_version').on('change', function() {
 			setSNMP();
 		});
 	});
@@ -635,7 +635,7 @@ function snmp_options_filter() {
 					</td>
 				</tr>
 			</table>
-			<input type='hidden' name='page' value='<?php print get_request_var('page'); ?>'>
+			<input type='hidden' name='page' value='<?php print html_escape_request_var('page'); ?>'>
 		</td>
 		</form>
 		<script type='text/javascript'>
@@ -653,15 +653,15 @@ function clearFilter() {
 		}
 
 		$(function() {
-			$('#go').click(function() {
+			$('#go').on('click', function() {
 				applyFilter();
 			});
 
-			$('#clear').click(function() {
+			$('#clear').on('click', function() {
 				clearFilter();
 			});
 
-			$('#mactrack_snmp').unbind().submit(function(event) {
+			$('#mactrack_snmp').off().on('submit', function(event) {
 				event.preventDefault();
 				applyFilter();
 			});
diff --git a/mactrack_utilities.php b/mactrack_utilities.php
index f8e5bf8..b2447fc 100644
--- a/mactrack_utilities.php
+++ b/mactrack_utilities.php
@@ -193,7 +193,7 @@ function applyFilter() {
 	}
 
 	$(function() {
-		$('#refresh').click(function() {
+		$('#refresh').on('click', function() {
 			applyFilter();
 		});
 	});
diff --git a/mactrack_vendormacs.php b/mactrack_vendormacs.php
index 1801fab..f149fca 100644
--- a/mactrack_vendormacs.php
+++ b/mactrack_vendormacs.php
@@ -246,16 +246,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 			});
diff --git a/mactrack_view_arp.php b/mactrack_view_arp.php
index 11979a5..49caf46 100644
--- a/mactrack_view_arp.php
+++ b/mactrack_view_arp.php
@@ -624,16 +624,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 			});
diff --git a/mactrack_view_devices.php b/mactrack_view_devices.php
index 5b09765..a35f836 100644
--- a/mactrack_view_devices.php
+++ b/mactrack_view_devices.php
@@ -542,7 +542,7 @@ function mactrack_device_filter2() {
 					</td>
 				</tr>
 			</table>
-			<input type='hidden' id='page' value='<?php print get_request_var('page'); ?>'>
+			<input type='hidden' id='page' value='<?php print html_escape_request_var('page'); ?>'>
 			<input type='hidden' id='report' value='devices'>
 			</form>
 			<script type='text/javascript'>
@@ -569,16 +569,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 			});
diff --git a/mactrack_view_dot1x.php b/mactrack_view_dot1x.php
index 2a949da..c15d221 100644
--- a/mactrack_view_dot1x.php
+++ b/mactrack_view_dot1x.php
@@ -756,16 +756,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 			});
diff --git a/mactrack_view_interfaces.php b/mactrack_view_interfaces.php
index bebfb32..d939892 100644
--- a/mactrack_view_interfaces.php
+++ b/mactrack_view_interfaces.php
@@ -685,16 +685,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 
diff --git a/mactrack_view_ips.php b/mactrack_view_ips.php
index bb16260..992fa59 100644
--- a/mactrack_view_ips.php
+++ b/mactrack_view_ips.php
@@ -338,7 +338,7 @@ function mactrack_ips_filter() {
 					</td>
 				</tr>
 			</table>
-			<input type='hidden' id='page' value='<?php print get_request_var('page'); ?>'>
+			<input type='hidden' id='page' value='<?php print html_escape_request_var('page'); ?>'>
 			<input type='hidden' id='report' value='ips'>
 			</form>
 			<script type='text/javascript'>
@@ -361,11 +361,11 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').submit(function(event) {
+				$('#export').on('submit', function(event) {
 					event.preventDefault();
 					exportRows();
 				});
diff --git a/mactrack_view_macs.php b/mactrack_view_macs.php
index 47a0878..bfcbc36 100644
--- a/mactrack_view_macs.php
+++ b/mactrack_view_macs.php
@@ -88,7 +88,7 @@ function form_actions() {
 
 	// if we are to save this form, instead of display it
 	if (isset_request_var('selected_items')) {
-		$selected_items = cacti_unserialize(stripslashes(get_nfilter_request_var('selected_items')));
+		$selected_items = unserialize(get_nfilter_request_var('selected_items'), ['allowed_classes' => false]);
 
 		if (!is_array($selected_items)) {
 			header('Location: mactrack_view_macs.php');
@@ -1352,16 +1352,16 @@ function exportRows() {
 			}
 
 			$(function() {
-				$('#mactrack').submit(function(event) {
+				$('#mactrack').on('submit', function(event) {
 					event.preventDefault();
 					applyFilter();
 				});
 
-				$('#clear').click(function() {
+				$('#clear').on('click', function() {
 					clearFilter();
 				});
 
-				$('#export').click(function() {
+				$('#export').on('click', function() {
 					exportRows();
 				});
 			});