Merge "Make filters on TOSCA entities generic"