Make search bar private, change reference on controll to its own property
Merge in updates