Xon Search Improvements