FIX BCU2 handling of group objects improved (still buggy)