LPS-42908 Apply same pattern to tags