Use placeholder for unconfigured state

Merging in changes from paolomoz