Review code and manage correctly query parameters