changes a couple of condition field names back to their non-direct equivalents, only shows ‘show more’ link when number of results exceeds row threshold, improves filter accuracy when mixing content and user type filters