[frontendmasters] Fix issues and improve extraction (closes #3661, closes #16328)