- Started support for MultiValueAttributes
- Added new field and made some fields optional
- Refactored this a bit
- Fixed bug which prevented more than one search result being returned