Getting closer, reworking search and encyclo pages, no time to rename