More searchbox fixes