Separate searches into new compoenents