added a fix for the input id / label for issue