refs #437 - better finding of action