LPS-43226 Applying selectEntityHandler to all instances