Add two tags modules, fix some errors in the helper they revealed.