Search 2.0 - Multi select, cleaned the code etc
fixed conflicts