Fix #496
This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.