Add same strpos optimization already committed on catalog side