Changed syntax in search result. eh.
Fixed merge conflicts, derk.