Revert from _mapping/field to _mapping

This fixes the result of https://github.com/elasticsearch/elasticsearch/issues/5177  
Updated fields service and proxies