Add check for >32 entries to prevent blank entries