optimize queries and thus fix test suite
Merge branch 'release-lizzie' of github.com:fairnopoly/fairnopoly into release-lizzie