Query/Set enhancements for client/service apps, thanks Alan