updated bundle ID handling to help with nesting