Fix for fetch request with substitution variables