Feature/reorder go results