change select queries in User Model