Wayfinder - Fix fetch template