Remove es_fields.js from places where it's not used
Added stuff for nested