Improve quotes plugin