Input Query Revised