Filtering done, UI update, few bug fixes

As above