few minor issues related to short form fill up on user clicks