Fixed bug where layers were added as children of themselves when added twice from catalog
Fixed ClassCastException caused from removing layer URIs from the bookmarks