Improved quote adding and validation