Changes to make testcases filtering work for product and automation type. Cleaning neede.