Changed architecture of all searches...