Fix issue_queries matcher
Add annotations to build