Re #1627 Added Language aware solr fields