Ok, so I registered to the calibre bugtracker and opened 2 tickets for enhancements.
http://bugs.calibre-ebook.com/ticket/7711
http://bugs.calibre-ebook.com/ticket/7712
They should be pretty self-explanatory but I'd be happy to explain the use case if needed.