DOF: Searching - fixes