Fix Search for all versions 5-7