Correcting limit being applied to non-lookup queries
Merge branch '1.5'