Fix error for searching upstream

Sam Q.requested to merge
(removed):sam-yaemiko-master-patch-02044 into master

This will correct some errors for searching upstream. Logs:rtirq_logs.txt

Merge request reports