Add labels to queries, close #91.