fix ordering issue and improve results show