Added entity based searching