Hi @NathanTew. This is a high priority feature for us and I added your +1 to the FR. For now, to fix your specific type of issue you either need to use the version history or a last resort would be directly editing the app json like mentioned in this thread, to remove the broken query.