tweak to correct pages after builtins > builtin
further work on werkz