Add wait for touch and query