Fix exported resource queries