fix issue in filename builder where there are no params
some cleanup, merged remote