refactor fill form and add scope :ordered to item and value