Hack to support early wipe of domains

Start to port the search heuristics

1 failure left