Re-add format note existence checks