Improvements to CLI input parsing and filtering