More support for default queue name