added namespace expansion to other query functions