diff --git a/CHANGELOG.md b/CHANGELOG.md
index 740374f..8740327 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.3.1] - 2020-07-29
+### Added
+- SQS queue message filter.
+- Added tags to SY IAM role and SQS queue.
+
 ## [1.3.0] - 2020-03-31
 ### Added
 - Log4j XML for internal Circus Train instance.
diff --git a/iam.tf b/iam.tf
index ac4630a..1ab1f60 100644
--- a/iam.tf
+++ b/iam.tf
@@ -22,6 +22,8 @@ resource "aws_iam_role" "shuntingyard_task_exec" {
   ]
 }
 EOF
+
+  tags = "${var.shuntingyard_tags}"
 }
 
 resource "aws_iam_role_policy_attachment" "task_exec_managed" {
@@ -47,4 +49,6 @@ resource "aws_iam_role" "shuntingyard_task" {
   ]
 }
 EOF
+
+  tags = "${var.shuntingyard_tags}"
 }
diff --git a/sqs.tf b/sqs.tf
index 15a5bcb..0f82a7f 100644
--- a/sqs.tf
+++ b/sqs.tf
@@ -6,6 +6,8 @@
 
 resource "aws_sqs_queue" "shuntingyard_sqs_queue" {
   name = "${local.instance_alias}-sqs-queue"
+
+  tags = "${var.shuntingyard_tags}"
 }
 
 resource "aws_sqs_queue_policy" "shuntingyard_sqs_queue_policy" {
@@ -33,8 +35,21 @@ resource "aws_sqs_queue_policy" "shuntingyard_sqs_queue_policy" {
 POLICY
 }
 
+data "template_file" "sqs_hive_metastore_sns_subscription_filter" {
+  template = <<EOF
+  {
+    "qualifiedTableName": [ $${tables_list} ]
+  }
+EOF
+
+  vars {
+    tables_list = "${join(",", formatlist("\"%s\"", var.selected_tables))}"
+  }
+}
+
 resource "aws_sns_topic_subscription" "sqs_hive_metastore_sns_subscription" {
-  topic_arn = "${var.metastore_events_sns_topic}"
-  protocol  = "sqs"
-  endpoint  = "${aws_sqs_queue.shuntingyard_sqs_queue.arn}"
+  topic_arn     = "${var.metastore_events_sns_topic}"
+  protocol      = "sqs"
+  endpoint      = "${aws_sqs_queue.shuntingyard_sqs_queue.arn}"
+  filter_policy = "${data.template_file.sqs_hive_metastore_sns_subscription_filter.rendered}"
 }