fix some issue

query for data disabled. waiting to enable