CLOUD-9 fixed filter on template