adding ability to handle partial table names