Removed a lot of queries
Merge branch 'master' of https://github.com/FastenYourSeatbelts/bagage-software