diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 17334c93..ddd385a2 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -208,7 +208,7 @@ if (!isset($_GET["import"])) {
 	}
 	echo "<p>";
 	textarea("query", $q, 20);
-	echo ($_POST ? "" : "<script type='text/javascript'>document.getElementsByTagName('textarea')[0].focus();</script>\n");
+	echo ($_POST ? "" : "<script type='text/javascript'>qs('textarea').focus();</script>\n");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
 	
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 3bc9854c..a1c1438f 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -540,10 +540,10 @@ function schemaMousemove(ev) {
 				if (divs[i].parentNode != div2.parentNode) {
 					left1 = Math.min(0, ref[1] - left) - 1;
 					divs[i].style.left = left1 + 'em';
-					divs[i].getElementsByTagName('div')[0].style.width = -left1 + 'em';
+					divs[i].querySelector('div').style.width = -left1 + 'em';
 					var left2 = Math.min(0, left - ref[1]) - 1;
 					div2.style.left = left2 + 'em';
-					div2.getElementsByTagName('div')[0].style.width = -left2 + 'em';
+					div2.querySelector('div').style.width = -left2 + 'em';
 				}
 				if (!lineSet[id]) {
 					var line = qs('#' + divs[i].id.replace(/^....(.+)-.+$/, 'refl$1'));
@@ -551,7 +551,7 @@ function schemaMousemove(ev) {
 					var top2 = top + div2.offsetTop / em;
 					if (divs[i].parentNode != div2.parentNode) {
 						top2 += ref[0] - top;
-						line.getElementsByTagName('div')[0].style.height = Math.abs(top1 - top2) + 'em';
+						line.querySelector('div').style.height = Math.abs(top1 - top2) + 'em';
 					}
 					line.style.left = (left + left1) + 'em';
 					line.style.top = Math.min(top1, top2) + 'em';
diff --git a/plugins/login-sqlite.php b/plugins/login-sqlite.php
index 668540fa..b0e175b2 100644
--- a/plugins/login-sqlite.php
+++ b/plugins/login-sqlite.php
@@ -16,14 +16,14 @@ class AdminerLoginSqlite {
 		?>
 <script type="text/javascript">
 addEventListener('load', function () {
-	var driver = document.getElementsByName('auth[driver]')[0];
+	var driver = qs('name="auth[driver]"');
 	if (isTag(driver, 'select')) {
 		driver.onchange = function () {
 			var trs = parentTag(driver, 'table').rows;
 			for (var i=1; i < trs.length - 1; i++) {
 				var disabled = /sqlite/.test(driver.value);
 				alterClass(trs[i], 'hidden', disabled);
-				trs[i].getElementsByTagName('input')[0].disabled = disabled;
+				trs[i].querySelector('input').disabled = disabled;
 			}
 		};
 	}
diff --git a/plugins/tables-filter.php b/plugins/tables-filter.php
index ef278f32..0319bbf1 100644
--- a/plugins/tables-filter.php
+++ b/plugins/tables-filter.php
@@ -60,7 +60,7 @@ function tablesFilterInput() {
 }
 
 if (sessionStorage){
-	var db = qs('#dbs').getElementsByTagName('select')[0];
+	var db = qs('#dbs').querySelector('select');
 	db = db.options[db.selectedIndex].text;
 	if (db == sessionStorage.getItem('adminer_tables_filter_db') && sessionStorage.getItem('adminer_tables_filter')){
 		qs('#filter-field').value = sessionStorage.getItem('adminer_tables_filter');