Fixing reset bug & handling '000' string from router