fixed bl, owner and service plugins after PR comments