Added missing properties on bookmark move.
Cleanup / comments