[#66149854] When searching for source 'W', return source W, U, NULL
Merge branch 'search_by_source_w' into develop