Yes -- an on the tap water filter is cheap and easy to use.
About $20- 30 at Target.