Disable broken complex query for now, Support multiple classes (ish)