remove bug where query could fail to m21theory