Add support for fallback and locked tags