More work towards having a query builder callback for contains