1.9 upgrade, utilize generic fields for future filter queries