Made quotes form model/controller-friendly V2