added filters and validation