Bug Fix

Fixed Queries