nasty fix of request query
slightly improved BaseModel::resolve()