Empty recordsets fixed