[Upg] Add filters type
[Fix] Return save result
[Upg] Cleanup
[Fix] Assign var
[Upg] Doc
[Fix] Unused code