DE2851: Completed fix, with UTs and AT.  However, had to wip AT, as for some reason searchApiTests fail locally, even though the procedure works manually.