Made category & tag archive pages work
Merge branch 'develop-cat-tag' into develop