Fix handling of marker set JSON when JSON mode and login support enabled