Improved grouping function, UI showes all annotations grouped; allows to ungroup an annotation; fixed bug duplicates entry in basket