Add filename parsing support and fix some tags