Fix parsers + add analytic query