Fix wrong widgets for Between* fields