Add quality selector support
Improve text