Added full search function