Refactor current orders select tag