Isolate find wishlist funciton so it can be overwritten
(cherry picked from commit 7025da77b66f26e87a7618994307a850575a3d39)