Fixed click listening, added dynamic id append for generated elements with existing ids