Fixed the queries for the keys
Merge branch 'master' of git://github.com/ntentan/atiaa