Updates to name and query fix.