[#547] Fix routes issue and datastore dump