BOS1409089 fix space in queries