fixed manual query interface