Add support for a separate filesystem tag, and in the process improve the support...