Add classification and evaluation for query subtype