Fix for Issue#308, added queries for polyglot test