fix to support entities subfolders