Updating queries and error handling

There was a post-error-check that needed to be wrapped by an else
statement, otherwise it would runaway and crash the node server.  Also
updated the label query to use the newer “match” statement instead of
the deprecated “start n=“ logic.