Query time boost

also intellij shows a warning that queryString might be null