Add placeholder in offline state
Merge remote-tracking branch 'origin/json-url' into json-url