new predefined queries + fixes on old ones
Merge branch 'master' of github.com:Alfanous-team/alfanous