improve completion behavior