Reimplemented full search functionality