Add comments and assertion to search