fixes for pattern matching in NodeController