Added updates to sorting and tabs