Removed search and fixed alert to only show when provided.