Updated autofiller - works nice now