fixed apply form issues