Fixing few issues with duplicated GUIDs and adding GUIDs only on enabled elements