Fixes bug 872547 - Improved mapping with a list of all fields and better analyzers.