Fixed search result issue: no organization