Fixes bug with More/Less buttons

Also shows current sort in dropdown