Fix Bug & Add order in DB

Fix Bug & Add order in DB