Bugfix: adding support methods to replace targets rather then needing to modify X when filtering