Bugfix - unecessary search happening, slowing things down.