Remove order dependence on Space query

Signed-off-by: Julian Friedman <julz.friedman@uk.ibm.com>