Updated query to use sharejss new query interface
Prettier messages