adding filters and fixing messages