Improved filtering and suggestions