diff --git a/server/assignments/models.py b/server/assignments/models.py
index 91eda69b..e9e6d867 100644
--- a/server/assignments/models.py
+++ b/server/assignments/models.py
@@ -43,6 +43,7 @@ class Assignment(index.Indexed, TimeStampedModel):
     class Meta:
         verbose_name = _('assignment')
         verbose_name_plural = _('assignments')
+        ordering = ['-created']
 
 
 class StudentSubmission(TimeStampedModel):
diff --git a/server/basicknowledge/wagtail_hooks.py b/server/basicknowledge/wagtail_hooks.py
index 867839fd..6aff32d7 100644
--- a/server/basicknowledge/wagtail_hooks.py
+++ b/server/basicknowledge/wagtail_hooks.py
@@ -1,7 +1,11 @@
 from wagtail.contrib.modeladmin.options import ModelAdmin, ModelAdminGroup, modeladmin_register
+from wagtail.core import hooks
+
 from .models import BasicKnowledge, InstrumentCategory, InstrumentType
 from django.utils.translation import ugettext_lazy as _
+from core.logger import get_logger
 
+logger = get_logger(__name__)
 
 class InstrumentAdmin(ModelAdmin):
     model = BasicKnowledge
@@ -27,3 +31,9 @@ class InstrumentGroup(ModelAdminGroup):
 
 
 modeladmin_register(InstrumentGroup)
+
+
+@hooks.register('construct_page_chooser_queryset')
+def order_by_created(pages, request):
+    logger.debug('constructing page chooser queryset')
+    return pages.live().order_by('-latest_revision_created_at')
diff --git a/server/books/blocks.py b/server/books/blocks.py
index 28725f1b..27343aa3 100644
--- a/server/books/blocks.py
+++ b/server/books/blocks.py
@@ -44,7 +44,7 @@ class BasicKnowledgeBlock(blocks.StructBlock):
         label = 'Instrument'
 
     description = blocks.RichTextBlock(required=False)
-    basic_knowledge = blocks.PageChooserBlock(required=True, target_model='basicknowledge.BasicKnowledge')
+    basic_knowledge = blocks.PageChooserBlock(required=True, page_type='basicknowledge.BasicKnowledge')
 
 
 # 'image_url'
diff --git a/server/surveys/models.py b/server/surveys/models.py
index 454cc8d7..ac9396fa 100644
--- a/server/surveys/models.py
+++ b/server/surveys/models.py
@@ -20,6 +20,9 @@ class Survey(models.Model, index.Indexed):
     def __str__(self):
         return self.title
 
+    class Meta:
+        ordering = ['-pk']
+
 
 class Answer(models.Model):
     owner = models.ForeignKey(get_user_model(), on_delete=models.CASCADE, related_name='answers')