Fixed issues with solved event, and text input