Filtering none command line in many place as we are in flatten mode now