optimized some queries
Merge branch 'master' of https://github.com/Gargamel1989/Rikker.git