CON-1016 | search bar; few minor changes