PLA-669 fix for broken layout for exact match