improved epub template refs #16799