Fixed few crashes due to Scala translation
Inventory wrapper rewrite

- More filters for item matching