Additional filter parameters, minor changes