Changed sort, text in dropdown and a bug