(1) Added object.id (2) Fixed double ctrl loading