Revert some changes made to feedsource code; tweak LayerTree