Fix queue population
Fix record simplification/cascading