Change to search form for keyword display, fix for admin user view