Field formatter fixes