Fix block query
Fix block query