Fix: XXX Search filter for non Alpha Themes