template and paginator fixes