Edited datagrid to handle facets and search