WIP. Custom fields appearing in filters section but for some reason not filtering.
Fixed bug in query model which was preventing custom fields being available.