Better handling of bookmark save