Move to new namespace; improve query