Fix merge
[quotes] Make them time-aware and well ordered
Add back binding of fields for new quote