Fixed orderByClause if pub is null