Added ability to filter using 'equals' or 'contains' as well as ability to order by any field