dont include the subquery tables in the main table, DUMBASS
add support for the blag categories
fix unit tests failing on category stuff