Remove serialization-to-string of values for HStoreDictionary (already done in DictionaryField to JSON)
Increase readability of long statement