Added more search index fields,
Added custom computed field for inherited templates