Move search over keywords to relationship way