Add the options HIDE_CATEGORY and clean up tags