Order layers correctly
Fixed bug where aggregates would overlay reports