Fixing near empty table issues