Bug fix on full search