Fixed group bug and changed non group collapsible API storage location