Fixed query not working because of conflicting namespaces.
Merging old cohen fix with new update.