Searching comments working but not thoroughly tested