Minor validation added to click-edit and store