more complete fix for previous issue

This version also fix model transmission to _queryDevice() method, and
is closer from 2.3.0 code.