Adjusted query binding system again