Added filter for var and text fields