Add error reporting to query.py
Use more RAA data