Update to fix display and detach queries correctly