Made some function improvements and added basic annocation searching