fixed issues #5 Wrong back navigation and #4 error when navigate back after delete set