The Floorist queries should not contain aggregations because that limits what the Business Insights people can do. Basically, we should return non-aggregated data and let them implement the aggregations they need.