Extend template content
Include terms in Completion result
Fix pagination edge case in template