add keyword to Location() invocation
Convert view handlers break package_id into org and offering