Fixed update issue with data, fixed ParseQuery NPE