Fix: Another query issue