Added categories and fixes some bugs (tags, categories escape-characters)