Add block handling to StatisticsCollectionQuery to make it more consistent with the rest of the queries