query issues resolved