Bug Fix: #4370 Searching tables persists across databases.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
Merge pull request #1144 from ashutoshdhundhara/bugfix_4370

Bug Fix: #4370 Searching tables persists across databases.