optimize db Query > remove array and replace with List from new query