Fix some namespaces
Fix max-results query