fixed some machine name fields for user profile during queries