Reviewqueries

queries issue solved with regards to issue #29