ticket #5074 - quote module improvements