Fixed to remove query