removed templates list limit
merge