Fixed Dictionary and removed old search prefix