Use identity field instead of uid filed for query