Add ability for search by entity properties