Applied 'current' object form to other fields

Took 'current' object form from Value1 and applied similar logic to
Relation, Comparison, and Value 2.
Considered applying to Action, but dropdown currently set up
differently.