* Some cleanup
* Display the id if no value was found