Improve demo query