Yes there is. The plan is to introduce more data into the index, such as the address (certainly post code / post town) but with a lower weight so it doesn’t skew the results.
Additionally, more advanced queries will be supported to allow searching by specific entity.
We don’t have a time frame on this yet, as we’re concentrating on delivering the common case initially.