tweaking completion logic