LPS-38244 Fix SO search
LPS-38351 Use the new API