Update location resolver to limit returned locations