fixed issue #530 and modified search

Added client identifiers to search
Customized results based on entity type