Cleaning up query and getting coverage back to 100