Improved the static query paths