fixes to tag filtering and ordering