Switch back to completion
Record new terms more aggressively