Add full search capability