Subject locator improvements

Refs #394