More performance improvements and fixes to tags