Fix #499 - Forced id to have quotes around it