getCurrentUser method signature change and query API change