Changed refrences to query id from `id` to `self[:id]`