Some JS updates and bits

Moved requirements into yml,
Only evaluate current form
Option was being evaluated by display logic, so any country dropdown caused logic to take forever.