Update keyup validation and cleaned up param calls

Update keyup validation and cleaned up param calls