Now properly shows empty states