[FINISHED #73705826]. FIX wrong search criteria contruction.