ordering filter data, tweaks in filter form