FIXED: Filters on wallet working properly

Fixed and working