Domain UI: Fix for searching domains and the move to factory