Merge "Add code to check for SELECT statements in query"