WP-1757 page not found fixes