Updated for Olaf's question regarding Resume queries