Soft launch fixes
- Fix grouping term which doesn't exist for a record