Added filtering on inputs.