able to filter by tag and code cleaned up