Actually register QueueTags from last change.
Merge pull request #650 from mcmonkey4eva/master

Pull request for shooting things
Merge pull request #651 from mcmonkey4eva/master

Pull request for fixing of issues