fixes #3101 and #3120 - missing features in api around images