[DF-1128] add save logic and small fix in filpath