Fix DB query to allow Item creation/modification without respecting the complexity

Fix DB query to allow Item creation/modification without respecting the complexity