Attempted fixes to upgrade to lQuery3