Bug Fix: Empty Image & Store Visibility