Support adding bookmarks with protocols

This would fix #555