Modified service to fix insert filled forms error