LPS-32232 Fixed finder query