diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 23c073ff80a..f10e0fc75d7 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -35,7 +35,7 @@ from . import migration, purge
 from .const import DATA_INSTANCE
 from .util import session_scope
 
-REQUIREMENTS = ['sqlalchemy==1.2.2']
+REQUIREMENTS = ['sqlalchemy==1.2.5']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -64,16 +64,13 @@ CONNECT_RETRY_WAIT = 3
 
 FILTER_SCHEMA = vol.Schema({
     vol.Optional(CONF_EXCLUDE, default={}): vol.Schema({
+        vol.Optional(CONF_DOMAINS): vol.All(cv.ensure_list, [cv.string]),
         vol.Optional(CONF_ENTITIES): cv.entity_ids,
-        vol.Optional(CONF_DOMAINS):
-            vol.All(cv.ensure_list, [cv.string]),
-        vol.Optional(CONF_EVENT_TYPES):
-            vol.All(cv.ensure_list, [cv.string])
+        vol.Optional(CONF_EVENT_TYPES): vol.All(cv.ensure_list, [cv.string]),
     }),
     vol.Optional(CONF_INCLUDE, default={}): vol.Schema({
+        vol.Optional(CONF_DOMAINS): vol.All(cv.ensure_list, [cv.string]),
         vol.Optional(CONF_ENTITIES): cv.entity_ids,
-        vol.Optional(CONF_DOMAINS):
-            vol.All(cv.ensure_list, [cv.string])
     })
 })
 
@@ -255,7 +252,7 @@ class Recorder(threading.Thread):
         self.hass.add_job(register)
         result = hass_started.result()
 
-        # If shutdown happened before HASS finished starting
+        # If shutdown happened before Home Assistant finished starting
         if result is shutdown_task:
             return
 
diff --git a/homeassistant/components/sensor/sql.py b/homeassistant/components/sensor/sql.py
index 5d5d61ff822..af9fa233d40 100644
--- a/homeassistant/components/sensor/sql.py
+++ b/homeassistant/components/sensor/sql.py
@@ -19,7 +19,7 @@ from homeassistant.helpers.entity import Entity
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['sqlalchemy==1.2.2']
+REQUIREMENTS = ['sqlalchemy==1.2.5']
 
 CONF_QUERIES = 'queries'
 CONF_QUERY = 'query'
diff --git a/requirements_all.txt b/requirements_all.txt
index ed3f9fea94e..66009b91c0e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1165,7 +1165,7 @@ spotcrime==1.0.3
 # homeassistant.components.recorder
 # homeassistant.scripts.db_migrator
 # homeassistant.components.sensor.sql
-sqlalchemy==1.2.2
+sqlalchemy==1.2.5
 
 # homeassistant.components.statsd
 statsd==3.2.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 6dee6b37c7d..4f2eafdac56 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -176,7 +176,7 @@ somecomfort==0.5.0
 # homeassistant.components.recorder
 # homeassistant.scripts.db_migrator
 # homeassistant.components.sensor.sql
-sqlalchemy==1.2.2
+sqlalchemy==1.2.5
 
 # homeassistant.components.statsd
 statsd==3.2.1