-1: having this filter here and in deployer (see fixed method) makes it too easy to change the code in one place and not the other. No duplication for that, please.