the old site-generator generated appropriate links when using AEP-XXX. It would be great if the new generator could do the same.