UI & Advanced Search Fix