Updated HSU queries