LPS-40761 Adding criteria to avoid performance issues