Bugzilla/1062819 pickup rebased/mobile connection core

`STATES` or `QUERIES` ? we have to decide. both are good for me, slight preference for `QUERIES`