minor correction
Added API for cartridge search
Fix bug 958977
WIP cuke reorganization