[FileBrowser]: Fixed errors related to applying ORM/Splitting
tail of last commit