Update to only search or prefixed containers instead of listing all containers