Fixed searching in xray, added CUI for xray blocks
More xray CUI work