Add fallback for empty tables