Add required fields verification
Fix query request