Improve quote switching