Restore Stake ordering test
Use TODO instead of FIXME flag
Provide extra param for model to shapefile serializer
Divide by two number of queries for POI serialization (ref #672)
Bound number of queries by number of Treks and Land layers (fixes #672)
Use higher-level methods on Shapefile serializer