Client - Fixed bookmark handles