Fix for aggregate returning None
Improved logging
Fixed colspan