Changed to autofill fields on filter