Improvement for matching current item