[release-0.4] bugfix: Filter rs that are not part of the current Deployment

[release-0.4] bugfix: Filter rs that are not part of the current Deployment #897