diff --git a/server/src/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/com/cloud/api/query/vo/AccountJoinVO.java
index f9b43183da8..6d37f4de00e 100644
--- a/server/src/com/cloud/api/query/vo/AccountJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/AccountJoinVO.java
@@ -21,6 +21,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import com.cloud.user.Account.State;
 import com.cloud.utils.db.GenericDao;
@@ -31,6 +32,7 @@ import org.apache.cloudstack.api.InternalIdentity;
 @Table(name="account_view")
 public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Identity {
 
+    @Id
     @Column(name="id")
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
index f3d904bb05b..a9c04586a92 100644
--- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
@@ -23,6 +23,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.network.Network.GuestType;
@@ -35,6 +36,7 @@ import com.cloud.vm.VirtualMachine.State;
 @Table(name="domain_router_view")
 public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/EventJoinVO.java b/server/src/com/cloud/api/query/vo/EventJoinVO.java
index 2511d964820..f29a942a59f 100644
--- a/server/src/com/cloud/api/query/vo/EventJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/EventJoinVO.java
@@ -22,6 +22,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
@@ -31,6 +32,7 @@ import com.cloud.event.Event.State;
 @Table(name="event_view")
 public class EventJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/com/cloud/api/query/vo/HostJoinVO.java
index 1eb82fbd320..a3796b97eba 100644
--- a/server/src/com/cloud/api/query/vo/HostJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java
@@ -22,6 +22,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -45,6 +46,7 @@ import org.apache.cloudstack.api.InternalIdentity;
 @Table(name="host_view")
 public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity {
 
+    @Id
     @Column(name="id")
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
index 02c53e97a5f..3fb43094ad3 100644
--- a/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/InstanceGroupJoinVO.java
@@ -20,6 +20,7 @@ import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
@@ -28,6 +29,7 @@ import com.cloud.utils.db.GenericDao;
 @Table(name="instance_group_view")
 public class InstanceGroupJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
index cbc9531c535..1a8818a22e4 100644
--- a/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectAccountJoinVO.java
@@ -20,6 +20,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.projects.ProjectAccount.Role;
@@ -29,6 +30,7 @@ import org.apache.cloudstack.api.InternalIdentity;
 @Table(name="project_account_view")
 public class ProjectAccountJoinVO extends BaseViewVO implements InternalIdentity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
index 8571c2629aa..a60c9370530 100644
--- a/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectInvitationJoinVO.java
@@ -22,6 +22,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.GenericDao;
@@ -31,6 +32,7 @@ import com.cloud.vm.VirtualMachine.State;
 @Table(name="project_invitation_view")
 public class ProjectInvitationJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
index cc9e21fb3c7..73ec9313289 100644
--- a/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ProjectJoinVO.java
@@ -22,6 +22,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.server.ResourceTag.TaggedResourceType;
@@ -35,6 +36,7 @@ import org.apache.cloudstack.api.InternalIdentity;
 @Table(name="project_view")
 public class ProjectJoinVO extends BaseViewVO implements InternalIdentity, Identity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
index fadb3504c7c..9ce9555d1be 100644
--- a/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/ResourceTagJoinVO.java
@@ -20,6 +20,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.server.ResourceTag.TaggedResourceType;
@@ -28,6 +29,7 @@ import com.cloud.server.ResourceTag.TaggedResourceType;
 @Table(name="resource_tag_view")
 public class ResourceTagJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java
index eb89ea994de..922e130ed30 100644
--- a/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/SecurityGroupJoinVO.java
@@ -20,6 +20,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.network.security.SecurityRule.SecurityRuleType;
@@ -29,6 +30,7 @@ import com.cloud.server.ResourceTag.TaggedResourceType;
 @Table(name="security_group_view")
 public class SecurityGroupJoinVO extends BaseViewVO implements ControlledViewEntity{
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java
index 3a438abfba5..44637db3400 100644
--- a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java
@@ -20,6 +20,7 @@ import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Id;
 import javax.persistence.Table;
 
 import com.cloud.utils.db.Encrypt;
@@ -32,6 +33,7 @@ import org.apache.cloudstack.api.InternalIdentity;
 @Table(name="user_view")
 public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, Identity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index db400ffdeff..025db47d599 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -24,6 +24,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -42,6 +43,7 @@ import com.cloud.vm.VirtualMachine.State;
 @Table(name="user_vm_view")
 public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id", updatable=false, nullable = false)
     private long id;
 
diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
index 907b02b633a..4f6b35bab82 100644
--- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java
@@ -21,6 +21,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
+import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -36,6 +37,7 @@ import com.cloud.vm.VirtualMachine;
 @Table(name="volume_view")
 public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity {
 
+    @Id
     @Column(name="id")
     private long id;