Add result col renaming and number results