Make search & filter more generic.