XEM implementation fixes
Manual search is working.