Fixes regarding invocation_id being inserted in tables and group ID

Please see if it works for you (Specially) Team 1