Improve s:FilterCurrent()