Added better metrics around queries and fixed query results to only return tags in result set