Improved #23

Fixed a problem with category links generation