[BUGFIX] Add required uid field to select statement