#1024924 by david_rothstein: Fix issues caused my a unwanted commit of dereine, provide sane defaults for contextual filters.