adding basic query parser