Fixed COUNT when no matches