applied comments
applied comments, fix bug and add sortable results