Add topic searching

Change-Id: I8e1a82edeaf3963f6c2ddee1cbe1f3c55fe8c1b6