Now supports search archive tempate
Merge branch 'develop'