Bug fix for empty results