Added activate-auto-fill function