Themes + "&" support in search