Improve manual completion behavior