* more collection+json related changes