fixed items|collections in search result
fixed merge conflict