#498 Fix markup and is-online