Search chaining fix