filter icon change and a few bug fixes