Removed distinction between make.all/make.one
Fixed test search page