Some quick alterations to the search