Added normal search and advanced search