Added handlling for zero result cases