Fix bug of snapshot fetch without includes
Rewritten (first part) of snapshot fetch to improve speed