add auto-fill handling non-filling in links properly.