XFields search fixed.