Feature/bugfix issues quote