MLHR-935 #resolve

Also made a few changes to pass JSHint