Improve completion apply.