Add index properties to provide a solid search function