Make CAAP check generals quicker if records not found
Fix, added regex for new image naming scheme, should fix at least Ambrosia