Hotfixed additional query