Refactor and order_by table comment
Bump version