Fix: Improve analytics in face of empty answers