Feature/multiple issues on single line state