Stop using @order in favor of order

order is passed as a local in every instance this partial is called

Fixes #2648