Bugfixes, and make new entry in group be sorted immediately after the selected one.
wip