Fixed String query issue #25 and #26