smarter queries for other types