fixes to new speed query button logic