Fix issue in search indexing
Fix minor notices.