updated more query and umb helper