Fix search options and massive actions again