Fixed Issues With Query String