Added chosen and terms inputs