fixed up use of default tag so that it will always be included in query if available.