Fix for wrong eval or query