Today
merge from fix_queryvisbug