fix state deprecation, add quotes to colum header sort action name
rebase