Added entity and expression search