Fix: Handle empty results