Add support for fallback tags
Fix issues with fallback tags
Add support for locked tags
Add max_clients support
Merge the fallback branch