Adds configurable admin base URL for images and improves f-catalog-id handling