add a couple of missing checks so we're not doing unnecessary work in processing
fix bugs with group scanning