Factored out search from sbt, fixed search issue, split newRequirements into 2 (to make it more clear what is going on)