Added protection against invalid categories
Removed urlencoded category names fomr hierrachy view