Perf improvement

and a few bug fixes to work with the BART feed