Updates to quotes & quotes handling