Intermediate refactoring.
Fixed problem with marker ID reference after plugin rename.
changelog for previous commits