Added category and tag url improvements