Resolve "(TID) Fix add device get queries" Closes #119 See merge request !203
mentioned in issue #140 (closed)