Minor refactors plus put paginator back on ajax error.