fix(search): correct sub searches (fixes #4526)