[PAXTB-3] Adding inner classes to bundle

Improved inner class handling, taking care of URL-encoded whitespace.