EZP-22105: refacor Legacy Storage search implementation