Fixed issue with modal id bindings