Add same optimizations applied to general.php catalog side