Fix remove finding and edit in form