DRRPP: partial merge from Michael, fix CSS issue. CSN: more prepop
Split query in pivot tables (mitigates the performance impact of multi-joins), still to be cleaned-up.