Added categories, tags and fixed index issues