#24 query changes @tamunakeshelava