Added limits for queries