Fix Bug 1027351 - Fix a massive derp in the script sort generator
1.2.8
1.2.9
Bug 1019675 - use term query for id search