#192, #125, #17, repairs queries against full data series