Remove "resolved" state

This is necessary to avoid confusion vs. closed state.
Fix typo and use proper user function call