LPS-33642 Apply new pattern for selecting entities to DL and IG