replace criterions by queries
Merge branch 'master' of https://github.com/kerli81/agobe.git