Filter persists entered values
Got rid of some annoying notices