Remove unused templates
Add more article criteria