fix: storage and single elem in cursor