Improve auto-field completion