Put workspace handling back the way it was because previous change totally broke search.