Added full search too