Fix up property front end to surface correct data