I'd love to test this if you could post the most current import. I couldn't see where $query->ensure_table() is to be installed to make the current code work. Thanks!