Added some basic non visual searching