code cleanup
bug fix function getFieldSingularName