Added test and code for restricting search by entity type.