changed the lazy load of fields to match the way its being done in the web app