Override dataset on organization level

Hi

I've had a few problems with Openbuildings lately, some of which I think I've caused myself. The delivered Swedish dataset is not always very good, or at least not adapted to our way to work. So when setting up the configuration for Connect I thought I'd make some changes to it. But with not very much experience of AECOsim it might not have been as good of an idea as intended. I'll try to explain what I've done and why to see if there's a better way to accomplish what I desire. 

First. As I said I wanted to make changes to the dataset, in which case I refer to the dataset that includes building elements like walls and beams. The first example; all walls that come with ABD and dataset_se are grouped together as inner or outer walls, making it really hard to pick the one you want. But more importantly, I wanted to be able to add different definitions depending on the type of wall (like concrete grade if it's a concrete wall, but not have that definition available if it's a framed partition wall). 

So I created new catalog type on organization level, copied over the delivered walls to these new catalogs and divided them depending on certain properties. One for concrete, one for insulation, one for existing walls and so on. At the same time I deleted them from the dataset file since I don't want doubles. But this meant that with every new update of OBD, I couldn't use the delivered dataset without having to edit it a little first. 

I did the same for slabs. With structural elements like beams I had a little different approach. The delivered sorting into catalogs where ok, concrete beams and steel beams were already separated, making it possible to add definitions relevant to steel to steel beams, and definitions for concrete to concrete beams. So I added a couple of newly created definition types to each catalog type on organization level, in a file called .../Configuration/Organization/DatagroupSystem/StructuralCatalogTypesexts.xml. Looking like this:

But at the same time there was a lot of definitions on both walls and beams that just toke focus of the ones we needed. All users are not modeling experts and need guidance. In order to get rid of that information I decided to hide definitions we don't use. Below are some of the definitions available when placing a steel beam right out of the swedish dataset: We are interested in only the phase and Object Classification. But the definitions I've added myself I want my users to use. As you see there's a lot of clutter and don't make for easy modeling.  

For the walls I copied to my organization level it was easy to hide the definitions in. But for structural elements I edited the StructuralFramingCatalog placed in the dataset-folder. This meant I now had both deleted walls from that file, and edited structural elements. So I decided to copy that file to my organization folder to make sure it wasn't overwritten when updating AECOsim next time. I'm not sure how clever that was. But, is there another way to override the dataset? Just like I added definitions to structural element in the StructuralCatalogTypesexts.xml file, is it possible to delete definitions for catalog types, or at least hide them, at organization level?

Next up was the Structural_parts file. Some of the patterns were wrong, some layers too. I also wanted to separate existing concrete from existing steel for beams and columns. So I did what I had done with the StructuralFramingCatalog and copied it to my organization folder to edit it there. I also prepended the TFDIR_PART at org. level to point at my newly edited part-file. 

Again, is there a way to let the dataset file be, and only create a file overriding the datasets part-file on certain points, instead of having it copied to the org. level? 

As I said earlier. I think this has lead to me having a couple of problems right now.

1. As I mentioned in this thread: https://communities.bentley.com/products/building/building_analysis___design/f/aecosim-speedikon-forum/178704/catalog-editor-is-grey my catalog editor is greyed out. There are a few odd things about this. One is that even though users running update 4 and update 5 have the exact same configuration, catalog types and so on, it's only greyed out in update 5, not in update 4. Second odd thing is that even though these wall catalog types and items I mentioned earlier are stored in the org. level folder, they appear to be in the workset when I check the properties of them. (If I change the destination to organization in the properties it just quickly changes back to workset, my _BB_dataset_organization_dg_lock is set to 0). 

This goes for both items as seen above, and types: 

This is not the case in update 4, wherein both items and types are as they should, in destination: organization. Again, both update 4 and 5 points to the exact same network configuration. I even have both updates installed at the same time, on different computers to verify this. How could this be? 

2. I ran validate in the catalog editor and found lots of warnings. Most of the warnings complains about below stated, for all the structural elements' catalog items. 

" 'Steel Beam':'Stålbalk':'ObjectDiscipline/@Discipline' references an invalid Defintion 'ObjectDiscipline' "
" 'Steel Beam':'Stålbalk':'ObjectClassification/@BSAB' references an invalid Defintion 'ObjectClassification' "

Even though they are written exactly the same in the dataset as in me copied one placed in the organization folder.
There are also these two warnings for all the catalog types I've added definitions to myself (as explained above):

" 'Steel Beam':'Stålbalk':'ObjectClassification/@BSAB' references an invalid Definition Property "

and 

" 'Steel Beam':'Stålbalk':'ObjectClassification/@BSAB' default Property value '27.E/34' is invalid "

Which are solved if I copy the file ObjectClassification.XSD from the dataset folder DataGroupSystem to the organization one. But it feels this will lead to even more trouble later on? 

3. The place deck tool crashes the program. I'm not sure this is because of what I mentioned above, but there's something telling me it could. 

So except these 3 questions. Is there an easy, stable way to edit the dataset. Cause right now I have too many problems concerning this to let it be. But going back to using the dataset as delivered is not an option, partly because projects are using this configuration right now, but mostly because it lacks important features.  

Regards, 

Robert