Enhanced filtering and display limit for Matrix