fixed the indexing issue, kadria  support, updated some templates