Update filter logic to use new embed template and embed API endpoints

@anthonyt Want to have a look through this?