playing with directives
a more correct fix for the autofill problem
Merge branch 'autofill'