Remove last usage of complex variable query, speeding up minify