* some collection+json related changes