Many changes, including fixing up search area