first part of fix issue #194, plus preemptive fix for big sku queries

Please review. The big SKU queries can be tested with an upcoming PR to the android example project.