Make vQuery faster and remove uQuery