Added trade_id to user_feedback and trade_lines