Revert "Revert "puzzle selector mongodb query strategy""

This reverts commit ddf1e8cfb0db0b48a4dffeed29bea3a28fcabd07.
improve puzzle selector
Merge branch 'master' into puzzle2

* master:
  improve puzzle selector
  Revert "Revert "puzzle selector mongodb query strategy""