Another fix for non-id objects with children
Added device and platform queries for the `?` character