Moved queries to SM cache instead of analytics node

- Tested works
- Exception at Server Manager end : TBD