Minor fixes. Allow to add form records and remove alerts