fixed blocks that were not being called in the main thread
fixed parse query filter when merging remote objects
Merge remote-tracking branch 'origin/master'