MDL-40667 administration: update to regular expressions