Fixes pagination and group file finding in embed

Meant to replace #6364