fix data fetch and add org options