Remove popular tags + handle catalog search