retriveform bug fixes