STS-3411: additional minor performance improvement by reducing the pressure on some maps