add whenever, escape sort parameters, add sort icons