NOT READY FOR MERGE Search command and query UI