Improve auto-select on filter