Added support for MultiMatchQuery, and made fields work again