Wrap values in dictionaries
Split related collection initialization
Fix sorting with limit
Get rid for flatten_values static method