Added capability to specify 'entity' and 'attribute' in search