Added filtering of parameters.