modified retrieval of current item in order decorator