Updated query and Add-in. Hopefully all works