Fix instance wide search

Fixup 89900f1e88fc70ec70f95d7619cba1657bb9258c