Improved query description to support multiple (sub)classes