Broke out input check and filter adding