Made sure fields are cleared before adding parameter and value.  Also created better wait for field to be clickable before entering values