Fix: duplicate sql request
Fix: missing field