Fix Add logic by Group