Max keys fetched, improvements for VOD support

Max 3 keys fetched (configurable), organization support (for VOD
support)