Merged old changes in Query with new fields