Added multiple search queries & mode switching