#194 query rework to fit new collection structure