queries updated with regards to issue #29