List quoted as block fixed on master
Add query validation