userIdentity edited
all queries converted to query builder expressions