change output and remove empty params