changes to allow query to work on demo