#904 - fixes to model and placeholder