us94 - Restructured tag search
Merge remote-tracking branch 'origin/s06-us94' into dev