Updated entity/expression search to allow type filtering