Fixes Issues in "Smart Search" [(see #5204)