added further filter validation and fixed button text and functionality