Merge pull request #121 from jthomerson/pulls/cms_fields_performance_improvement

ENHANCEMENT: significant speed improvement for many locales
Fixed coding conventions
ENHANCEMENT: better pattern for dis-/enabling locale filter