Improve search
Fix comments scheduler