implemented name resolver for queries, added placeholder proxy