Removed lang field, we will use short locale and long locale.
Implemented support for field mapping in Query Filtration mechanism