Fixes from Peer Review,Table Search by query string