LPS-42257 Fix finder query