Improve the quick labeler again.