Modified query; still need to test
Merge branch 'master' of https://github.com/eTendance/main