Added full search functionality