Fix call search after relationship refactor