Filter clearing & UI updated fixed