Reviewqueries

queries issue solved with regards to issue #29 
Just remove it if not needed.