Fixed a few things with Advanced Search