Made search query variables easier to configure.