Fix 649 / sortkey and enable page-type regex search